summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-05-02 20:15:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-05-02 20:15:52 (GMT)
commitb4f86a4ce85e4e370a67455de6586a02f158a789 (patch)
tree5fef12b8d2ac806c012a4e6fe1c518e3e0c71ba9
parent648d9c182723862228065686f2c32c4b6bdcdf5e (diff)
downloadgit-2.0.0-rc2.zip
git-2.0.0-rc2.tar.gz
git-2.0.0-rc2.tar.bz2
Git 2.0-rc2v2.0.0-rc2
-rw-r--r--Documentation/RelNotes/2.0.0.txt7
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.txt
index ffd4899..e6911ac 100644
--- a/Documentation/RelNotes/2.0.0.txt
+++ b/Documentation/RelNotes/2.0.0.txt
@@ -179,7 +179,12 @@ Unless otherwise noted, all the fixes since v1.9 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).
- * The remote-helepr interface to fast-import/fast-export via the
+ * The shell prompt script (in contrib/), when using the PROMPT_COMMAND
+ interface, used an unsafe construct when showing the branch name in
+ $PS1.
+ (merge 8976500 rh/prompt-pcmode-avoid-eval-on-refname later to maint).
+
+ * The remote-helper interface to fast-import/fast-export via the
transport-helper has been tightened to avoid leaving the import
marks file from a failed/crashed run, as such a file that is out of
sync with the reality confuses a later invocation of itself.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 690cece..d356425 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.0.0-rc1
+DEF_VER=v2.0.0-rc2
LF='
'