GIT 1.6.3.2

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

diff --git a/Documentation/RelNotes-1.6.3.2.txt b/Documentation/RelNotes-1.6.3.2.txt
index 0b48d1a1dfba79d5fe5c85d5cee9327a7ab11a5e..b2f3f0293c0da729d642dc7e4645df26c86c338d 100644 (file)
--- a/Documentation/RelNotes-1.6.3.2.txt
+++ b/Documentation/RelNotes-1.6.3.2.txt
@@ -37,13 +37,17 @@ Fixes since v1.6.3.1
    the first hunk that adds a line at the top was split into two and
    both halves are marked to be used.
 
    the first hunk that adds a line at the top was split into two and
    both halves are marked to be used.
 

+ * "git blame path" misbehaved at the commit where path became file
+   from a directory with some files in it.
+

  * "git for-each-ref" had a segfaulting bug when dealing with a tag object
    created by an ancient git.
 
  * "git format-patch -k" still added patch numbers if format.numbered
    configuration was set.
 
  * "git for-each-ref" had a segfaulting bug when dealing with a tag object
    created by an ancient git.
 
  * "git format-patch -k" still added patch numbers if format.numbered
    configuration was set.
 

- * "git grep --color ''" did not terminate.
+ * "git grep --color ''" did not terminate.  The command also had
+   subtle bugs with its -w option.

 
  * http-push had a small use-after-free bug.
 
 
  * http-push had a small use-after-free bug.
 


@@ -55,9 +59,3 @@ Fixes since v1.6.3.1
 
 Many other general usability updates around help text, diagnostic messages
 and documentation are included as well.
 
 Many other general usability updates around help text, diagnostic messages
 and documentation are included as well.

-
----
-exec >/var/tmp/1
-O=v1.6.3.1-68-g456cb4c
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d292e3a2d38a935a0f06b708d9d0b4a36d58ba66..0673f0db9f044c294446fb5df1c87f83a335d6f8 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.6.3.1
+DEF_VER=v1.6.3.2

 
 LF='
 '
 
 LF='
 '