From a48f5d7153761fabf0b04fdfd1667adf7eeeddbe Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 3 May 2009 16:14:58 -0700 Subject: [PATCH] GIT 1.6.2.5 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.2.5.txt | 21 +++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.6.2.5.txt diff --git a/Documentation/RelNotes-1.6.2.5.txt b/Documentation/RelNotes-1.6.2.5.txt new file mode 100644 index 000000000..b23f9e95d --- /dev/null +++ b/Documentation/RelNotes-1.6.2.5.txt @@ -0,0 +1,21 @@ +GIT v1.6.2.5 Release Notes +========================== + +Fixes since v1.6.2.4 +-------------------- + +* "git apply" mishandled if you fed a git generated patch that renames + file A to B and file B to A at the same time. + +* "git diff -c -p" (and "diff --cc") did not expect to see submodule + differences and instead refused to work. + +* "git grep -e '('" segfaulted, instead of diagnosing a mismatched + parentheses error. + +* "git fetch" generated packs with offset-delta encoding when both ends of + the connection are capable of producing one; this cannot be read by + ancient git and the user should be able to disable this by setting + repack.usedeltabaseoffset configuration to false. + + diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index c92670bf4..9d65aed41 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.2.4 +DEF_VER=v1.6.2.5 LF=' ' diff --git a/RelNotes b/RelNotes index 22ea275ee..c02134157 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.2.4.txt \ No newline at end of file +Documentation/RelNotes-1.6.2.5.txt \ No newline at end of file -- 2.30.2