diff options
| -rw-r--r-- | Documentation/RelNotes/2.0.0.txt | 7 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.txt index ffd4899dcd..e6911ac42f 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 690cece24c..d356425e19 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=' ' |