From f3f778df6900881a7bac409c927931c32b82bcb5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 28 Dec 2011 11:49:09 -0800 Subject: [PATCH 1/2] Git 1.7.8.2 Contains accumulated fixes since 1.7.8 that have been merged to the 'master' branch in preparation for the 1.7.9 release. Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.8.2.txt | 71 ++++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/1.7.8.2.txt diff --git a/Documentation/RelNotes/1.7.8.2.txt b/Documentation/RelNotes/1.7.8.2.txt new file mode 100644 index 0000000000..e74f4ef1ef --- /dev/null +++ b/Documentation/RelNotes/1.7.8.2.txt @@ -0,0 +1,71 @@ +Git v1.7.8.2 Release Notes +========================== + +Fixes since v1.7.8.1 +-------------------- + + * Porcelain commands like "git reset" did not distinguish deletions + and type-changes from ordinary modification, and reported them with + the same 'M' moniker. They now use 'D' (for deletion) and 'T' (for + type-change) to match "git status -s" and "git diff --name-status". + + * The configuration file parser used for sizes (e.g. bigFileThreshold) + did not correctly interpret 'g' suffix. + + * The replacement implemention for snprintf used on platforms with + native snprintf that is broken did not use va_copy correctly. + + * LF-to-CRLF streaming filter replaced all LF with CRLF, which might + be techinically correct but not friendly to people who are trying + to recover from earlier mistakes of using CRLF in the repository + data in the first place. It now refrains from doing so for LF that + follows a CR. + + * git native connection going over TCP (not over SSH) did not set + SO_KEEPALIVE option which failed to receive link layer errors. + + * "git branch -m HEAD" is an obvious no-op but was not + allowed. + + * "git checkout -m" did not recreate the conflicted state in a "both + sides added, without any common ancestor version" conflict + situation. + + * "git cherry-pick $commit" (not a range) created an unnecessary + sequencer state and interfered with valid workflow to use the + command during a session to cherry-pick multiple commits. + + * You could make "git commit" segfault by giving the "--no-message" + option. + + * "fast-import" did not correctly update an existing notes tree, + possibly corrupting the fan-out. + + * "git fetch-pack" accepted unqualified refs that do not begin with + refs/ by mistake and compensated it by matching the refspec with + tail-match, which was doubly wrong. This broke fetching from a + repository with a funny named ref "refs/foo/refs/heads/master" and a + 'master' branch with "git fetch-pack refs/heads/master", as the + command incorrectly considered the former a "match". + + * "git log --follow" did not honor the rename threshold score given + with the -M option (e.g. "-M50%"). + + * "git mv" gave suboptimal error/warning messages when it overwrites + target files. It also did not pay attention to "-v" option. + + * Authenticated "git push" over dumb HTTP were broken with a recent + change and failed without asking for password when username is + given. + + * "git push" to an empty repository over HTTP were broken with a + recent change to the ref handling. + + * "git push -v" forgot how to be verbose by mistake. It now properly + becomes verbose when asked to. + + * When a "reword" action in "git rebase -i" failed to run "commit --amend", + we did not give the control back to the user to resolve the situation, and + instead kept the original commit log message. + +Also contains minor fixes and documentation updates. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index a04c8f32b7..36ae50b8f9 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.8 +DEF_VER=v1.7.8.2 LF=' ' diff --git a/RelNotes b/RelNotes index 96a35fb995..d30cd7e62f 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.8.1.txt \ No newline at end of file +Documentation/RelNotes/1.7.8.2.txt \ No newline at end of file From 17b4e93d5b849293e6a3659bbc4075ed8a6e97e2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 28 Dec 2011 12:07:22 -0800 Subject: [PATCH 2/2] Update draft release notes to 1.7.9 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.9.txt | 76 ++------------------------------ 1 file changed, 4 insertions(+), 72 deletions(-) diff --git a/Documentation/RelNotes/1.7.9.txt b/Documentation/RelNotes/1.7.9.txt index 4f65956aa0..9689efa986 100644 --- a/Documentation/RelNotes/1.7.9.txt +++ b/Documentation/RelNotes/1.7.9.txt @@ -15,11 +15,6 @@ Updates since v1.7.8 locale is appropriately set. Distributors can drop in new PO files in po/ to add new translations. - * Porcelain commands like "git reset" did not distinguish deletions - and type-changes from ordinary modification, and reported them with - the same 'M' moniker. They now use 'D' (for deletion) and 'T' (for - type-change) to match "git status -s" and "git diff --name-status". - * The code to handle username/password for HTTP transaction used in "git push" & "git fetch" learned to talk "credential API" to external programs to cache or store them, to allow integration with @@ -36,9 +31,6 @@ Updates since v1.7.8 * "git add" learned to stream large files directly into a packfile instead of writing them into individual loose object files. - * "git branch -m HEAD" is an obvious no-op and is - now allowed. - * "git checkout -B " is a more intuitive way to spell "git reset --keep ". @@ -63,9 +55,6 @@ Updates since v1.7.8 * The set of built-in function-header patterns for various languages knows MATLAB. - * "git log --follow" honors the rename threshold score given with the - -M option (e.g. "-M50%"). - * "git log --format=''" learned new %g[nNeE] specifiers to show information from the reflog entries when warlking the reflog (i.e. with "-g"). @@ -106,66 +95,9 @@ Also contains minor documentation updates and code clean-ups. Fixes since v1.7.8 ------------------ - * The replacement implemention for snprintf used on platforms with - native snprintf that is broken did not use va_copy correctly. - (merge a9bfbc5 jk/maint-snprintf-va-copy later to maint). - - * git native connection going over TCP (not over SSH) did not set - SO_KEEPALIVE option which failed to receive link layer errors. - (merge e47a858 ew/keepalive later to maint). - - * LF-to-CRLF streaming filter replaced all LF with CRLF, which might - be techinically correct but not friendly to people who are trying - to recover from earlier mistakes of using CRLF in the repository - data in the first place. It now refrains from doing so for LF that - follows a CR. - (merge 8496f56 jc/maint-lf-to-crlf-keep-crlf later to maint). - - * "git checkout -m" did not recreate the conflicted state in a "both - sides added, without any common ancestor version" conflict - situation. - (merge 5cd7fadc jc/checkout-m-twoway later to maint). - - * "git cherry-pick $commit" (not a range) created an unnecessary - sequencer state and interfered with valid workflow to use the - command during a session to cherry-pick multiple commits. - (merge d596118 jn/maint-sequencer-fixes later to maint). - - * You could make "git commit" segfault by giving the "--no-message" - option. - (merge 03f94ae jk/maint-strbuf-missing-init later to maint). - - * "fast-import" did not correctly update an existing notes tree, - possibly corrupting the fan-out. - - * "git fetch-pack" accepted unqualified refs that do not begin with - refs/ by mistake and compensated it by matching the refspec with - tail-match, which was doubly wrong. This broke fetching from a - repository with a funny named ref "refs/foo/refs/heads/master" and a - 'master' branch with "git fetch-pack refs/heads/master", as the - command incorrectly considered the former a "match". - (merge bab8d28 jk/fetch-no-tail-match-refs later to maint). - - * "git mv" gave suboptimal error/warning messages when it overwrites - target files. It also did not pay attention to "-v" option. - (merge 534376c jk/maint-mv later to maint). - - * When a "reword" action in "git rebase -i" failed to run "commit --amend", - we did not give the control back to the user to resolve the situation, and - instead kept the original commit log message. - (merge 0becb3e aw/rebase-i-stop-on-failure-to-amend later to maint). - - * Authenticated "git push" over dumb HTTP were broken with a recent - change and failed without asking for password when username is - given. - (merge a4ddbc3 jk/maint-push-over-dav later to maint). - - * "git push" to an empty repository over HTTP were broken with a - recent change to the ref handling. - (merge 02f7914 jk/http-push-to-empty later to maint). - - * "git push -v" forgot how to be verbose by mistake. It now properly is. - (merge bd2c86e jk/maint-push-v-is-verbose later to maint). +Unless otherwise noted, all the fixes since v1.7.8 in the maintenance +releases are contained in this release (see release notes to them for +details). * gitweb did not correctly fall back to configured $fallback_encoding that is not 'latin1'. @@ -173,7 +105,7 @@ Fixes since v1.7.8 -- exec >/var/tmp/1 -O=v1.7.8.1-384-g2b6dd6a +O=v1.7.8.2-301-g48de656 echo O=$(git describe master) git log --first-parent --oneline --reverse ^$O master echo