Git fork

Git 1.8.3-rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>

+9 -19
+8 -18
Documentation/RelNotes/1.8.3.txt
··· 29 29 current directory, because the behaviour in Git 2.0 will be different 30 30 from today's version in such a situation. 31 31 32 + In Git 2.0, "git add <path>" will behave as "git add -A <path>", so 33 + that "git add dir/" will notice paths you removed from the directory 34 + and record the removal. Versions before Git 2.0, including this 35 + release, will keep ignoring removals, but the users who rely on this 36 + behaviour is encouraged to use "git add --ignore-removal <path>" and 37 + get used to it. 38 + 32 39 33 40 Updates since v1.8.2 34 41 -------------------- 35 42 36 43 Foreign interface 37 44 38 - * remote-hg helper (in contrib/) has been updated. 45 + * remote-hg and remote-bzr helpers (in contrib/) have been updated. 39 46 40 47 41 48 UI, Workflows & Features ··· 222 229 order to decide which of unpack-objects or index-pack to run, it 223 230 returned without closing the error stream, which led to a hang 224 231 sideband thread. 225 - (merge 49ecfa1 jk/receive-pack-deadlocks-with-early-failure later to maint). 226 232 227 233 * Zsh completion forgot that '%' character used to signal untracked 228 234 files needs to be escaped with another '%'. 229 - (merge 24b6132 fc/untracked-zsh-prompt later to maint). 230 235 231 236 * A commit object whose author or committer ident are malformed 232 237 crashed some code that trusted that a name, an email and an 233 238 timestamp can always be found in it. 234 - (merge de5abe9 jk/chopped-ident later to maint). 235 239 236 240 * When "upload-pack" fails while generating a pack in response to 237 241 "git fetch" (or "git clone"), the receiving side mistakenly said 238 242 there was a programming error to trigger the die handler 239 243 recursively. 240 - (merge 1ece66b jk/a-thread-only-dies-once later to maint). 241 244 242 245 * "rev-list --stdin" and friends kept bogus pointers into input 243 246 buffer around as human readble object names. This was not a huge ··· 258 261 the standard error stream, which is not a very smart thing to do. 259 262 Later open may return file descriptor #2 for unrelated purpose, and 260 263 error reporting code may write into them. 261 - (merge a749c0b tr/perl-keep-stderr-open later to maint). 262 264 263 265 * "git show-branch" was not prepared to show a very long run of 264 266 ancestor operators e.g. foobar^2~2^2^2^2...^2~4 correctly. 265 - (merge aaa07e3 jk/show-branch-strbuf later to maint). 266 267 267 268 * "git diff --diff-algorithm algo" is also understood as "git diff 268 269 --diff-algorithm=algo". 269 - (merge 0895c6d jk/diff-algo-finishing-touches later to maint). 270 270 271 271 * The new core.commentchar configuration was not applied to a few 272 272 places. 273 - (merge 89c3bbd rt/commentchar-fmt-merge-msg later to maint). 274 273 275 274 * "git bundle" did not like a bundle created using a commit without 276 275 any message as its one of the prerequistes. 277 - (merge 5446e33 lf/bundle-with-tip-wo-message later to maint). 278 276 279 277 * "git log -S/-G" started paying attention to textconv filter, but 280 278 there was no way to disable this. Make it honor --no-textconv 281 279 option. 282 - (merge 61690bf sr/log-SG-no-textconv later to maint). 283 280 284 281 * When used with "-d temporary-directory" option, "git filter-branch" 285 282 failed to come back to the original working tree to perform the 286 283 final clean-up procedure. 287 - (merge 9727601 jk/filter-branch-come-back-to-original later to maint). 288 284 289 285 * "git merge $(git rev-parse v1.8.2)" behaved quite differently from 290 286 "git merge v1.8.2", as if v1.8.2 were written as v1.8.2^0 and did ··· 292 288 notice the type of the tag object, in addition to the dwim_ref() 293 289 based classification the current code uses (i.e. the name appears 294 290 in refs/tags/) to decide when to special case merging of tags. 295 - (merge a38d3d7 jc/merge-tag-object later to maint). 296 291 297 292 * Fix 1.8.1.x regression that stopped matching "dir" (without 298 293 trailing slash) to a directory "dir". ··· 304 299 305 300 * The prompt string generator (in contrib/completion/) did not notice 306 301 when we are in a middle of a "git revert" session. 307 - (merge 3ee4452 rr/prompt-revert-head later to maint). 308 302 309 303 * "submodule summary --summary-limit" option did not support 310 304 "--option=value" form. 311 - (merge 862ae6c rs/submodule-summary-limit later to maint). 312 305 313 306 * "index-pack --fix-thin" used an uninitialized value to compute 314 307 delta depths of objects it appends to the resulting pack. 315 - (merge 57165db jk/index-pack-correct-depth-fix later to maint). 316 308 317 309 * "index-pack --verify-stat" used a few counters outside protection 318 310 of mutex, possibly showing incorrect numbers. 319 - (merge 8f82aad nd/index-pack-threaded-fixes later to maint). 320 311 321 312 * The code to keep track of what directory names are known to Git on 322 313 platforms with case insensitive filesystems can get confused upon a ··· 326 317 correctly to the ls-remote and fetch with recent version of Git. 327 318 328 319 * Recent optimization broke shallow clones. 329 - (merge f59de5d jk/peel-ref later to maint). 330 320 331 321 * "git cmd -- ':(top'" was not diagnosed as an invalid syntax, and 332 322 instead the parser kept reading beyond the end of the string.
+1 -1
GIT-VERSION-GEN
··· 1 1 #!/bin/sh 2 2 3 3 GVF=GIT-VERSION-FILE 4 - DEF_VER=v1.8.2.GIT 4 + DEF_VER=v1.8.3-rc0 5 5 6 6 LF=' 7 7 '