git, branch v1.6.3.2

GIT 1.6.3.2

2009-06-04T05:47:48Z

Signed-off-by: Junio C Hamano

grep: fix empty word-regexp matches

2009-06-03T18:32:29Z

The command "git grep -w ''" dies as soon as it encounters an empty line, reporting (wrongly) that "regexp returned nonsense". The first hunk of this patch relaxes the sanity check that is responsible for that, allowing matches to start at the end. The second hunk complements it by making sure that empty matches are rejected if -w was specified, as they are not really words. GNU grep does the same: $ echo foo | grep -c '' 1 $ echo foo | grep -c -w '' 0 Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

blame: correctly handle a path that used to be a directory

2009-06-03T07:49:34Z

When trying to see if the same path exists in the parent, we ran "diff-tree" with pathspec set to the path we are interested in with the parent, and expect either to have exactly one resulting filepair (either "changed from the parent", "created when there was none") or nothing (when there is no change from the parent). If the path used to be a directory, however, we will also see unbounded number of entries that talk about the files that used to exist underneath the directory in question. Correctly pick only the entry that describes the path we are interested in in such a case (namely, the creation of the path as a regular file). Noticed by Ben Willard. Signed-off-by: Junio C Hamano

add -i: do not dump patch during application

2009-06-03T07:11:15Z

Remove a debugging print that snuck in at 7a26e65 (Revert "git-add--interactive: remove hunk coalescing", 2009-05-16). Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

Update draft release notes for 1.6.3.2

2009-06-02T15:11:30Z

Signed-off-by: Junio C Hamano

Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint

2009-06-02T14:48:44Z

* cb/maint-1.6.0-xdl-merge-fix: Change xdl_merge to generate output even for null merges t6023: merge-file fails to output anything for a degenerate merge Conflicts: xdiff/xmerge.c

Merge branch 'rs/maint-grep-word-regexp-fix' into maint

2009-06-02T14:48:09Z

* rs/maint-grep-word-regexp-fix: grep: fix colouring of matches with zero length grep: fix word-regexp at the beginning of lines

Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint

2009-06-02T14:47:03Z

* sb/maint-1.6.2-opt-filename-fix: apply, fmt-merge-msg: use relative filenames commit: -F overrides -t

Merge branch 'jc/maint-add-p-coalesce-fix' into maint

2009-06-02T14:46:52Z

* jc/maint-add-p-coalesce-fix: t3701: ensure correctly set up repository after skipped tests Revert "git-add--interactive: remove hunk coalescing" Splitting a hunk that adds a line at the top fails in "add -p"

Merge branch 'tr/maint-doc-stash-pop' into maint

2009-06-02T14:43:45Z

* tr/maint-doc-stash-pop: Documentation: teach stash/pop workflow instead of stash/apply