GIT 1.5.4.3

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

diff --git a/Documentation/RelNotes-1.5.4.3.txt b/Documentation/RelNotes-1.5.4.3.txt
new file mode 100644 (file)
index 0000000..b0fc67f
--- /dev/null
+++ b/Documentation/RelNotes-1.5.4.3.txt
@@ -0,0 +1,27 @@
+GIT v1.5.4.3 Release Notes
+==========================
+
+Fixes since v1.5.4.2
+--------------------
+
+ * RPM spec used to pull in everything with 'git'.  This has been
+   changed so that 'git' package contains just the core parts,
+   and we now supply 'git-all' metapackage to slurp in everything.
+   This should match end user's expectation better.
+
+ * When some refs failed to update, git-push reported "failure"
+   which was unclear if some other refs were updated or all of
+   them failed atomically (the answer is the former).  Reworded
+   the message to clarify this.
+
+ * "git clone" from a repository whose HEAD was misconfigured
+   did not set up the remote properly.  Now it tries to do
+   better.
+
+ * Updated git-push documentation to clarify what "matching"
+   means, in order to reduce user confusion.
+
+ * Updated git-add documentation to clarify "add -u" operates in
+   the current subdirectory you are in, just like other commands.
+
+ * git-gui updates to work on OSX and Windows better.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 03fb9d76aea22a7d7d7f5e2351fcf169ccd7987b..0d4c2f79c58a2141dc5d5d6998f7ab2a2fa31881 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.5.4.2.GIT
+DEF_VER=v1.5.4.3.GIT

 
 LF='
 '
 
 LF='
 '


@@ -16,7 +16,8 @@ elif test -d .git &&
        case "$VN" in
        *$LF*) (exit 1) ;;
        v[0-9]*)
        case "$VN" in
        *$LF*) (exit 1) ;;
        v[0-9]*)

-               git diff-index --quiet HEAD || VN="$VN-dirty" ;;
+               test -z "$(git diff-index --name-only HEAD)" ||
+               VN="$VN-dirty" ;;

        esac
 then
        VN=$(echo "$VN" | sed -e 's/-/./g');
        esac
 then
        VN=$(echo "$VN" | sed -e 's/-/./g');

diff --git a/RelNotes b/RelNotes
index 7ab3485455cf46ee42ada62a2e5e78ba624f53c3..3084ce6946658475767c3098d79c60aff2bb7347 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.5.4.2.txt
\ No newline at end of file
+Documentation/RelNotes-1.5.4.3.txt
\ No newline at end of file