summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-05-28 22:50:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-05-30 17:13:41 (GMT)
commit34d5217584ee4722d0c0b07ed6c8f1f01ad157c3 (patch)
tree2afc851b60064ef8ef899cb6909a3a1fd0eb3003
parent12188a82990da099e2f3cf3d37aa4e0362122478 (diff)
downloadgit-34d5217584ee4722d0c0b07ed6c8f1f01ad157c3.zip
git-34d5217584ee4722d0c0b07ed6c8f1f01ad157c3.tar.gz
git-34d5217584ee4722d0c0b07ed6c8f1f01ad157c3.tar.bz2
Git 1.9.4v1.9.4
This is expected to be the final maintenance release for 1.9 series, merging the remaining fixes that are relevant and are already in 2.0. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.9.4.txt16
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 20 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.9.4.txt b/Documentation/RelNotes/1.9.4.txt
new file mode 100644
index 0000000..e1d1835
--- /dev/null
+++ b/Documentation/RelNotes/1.9.4.txt
@@ -0,0 +1,16 @@
+Git v1.9.4 Release Notes
+========================
+
+Fixes since v1.9.3
+------------------
+
+ * Commands that take pathspecs on the command line misbehaved when
+ the pathspec is given as an absolute pathname (which is a
+ practice not particularly encouraged) that points at a symbolic
+ link in the working tree.
+
+ * An earlier fix to the shell prompt script (in contrib/) for using
+ the PROMPT_COMMAND interface did not correctly check if the extra
+ code path needs to trigger, causing the branch name not to appear
+ when 'promptvars' option is disabled in bash or PROMPT_SUBST is
+ unset in zsh.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index dd2f0aa..3d54378 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.9.3/git.html[documentation for release 1.9.3]
+* link:v1.9.4/git.html[documentation for release 1.9.4]
* release notes for
+ link:RelNotes/1.9.4.txt[1.9.4],
link:RelNotes/1.9.3.txt[1.9.3],
link:RelNotes/1.9.2.txt[1.9.2],
link:RelNotes/1.9.1.txt[1.9.1],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 3b385d3..a9886fb 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.9.3
+DEF_VER=v1.9.4
LF='
'
diff --git a/RelNotes b/RelNotes
index 7b78eb9..2bff7b2 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.9.3.txt \ No newline at end of file
+Documentation/RelNotes/1.9.4.txt \ No newline at end of file