From e07665e524d0398a34059d605f674182bfeeaf39 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 28 Mar 2010 21:32:25 -0700 Subject: [PATCH 1/3] Prepare for 1.7.0.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.0.4.txt | 19 +++++++++++++++++++ RelNotes | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes-1.7.0.4.txt diff --git a/Documentation/RelNotes-1.7.0.4.txt b/Documentation/RelNotes-1.7.0.4.txt new file mode 100644 index 0000000000..cbc94a2f08 --- /dev/null +++ b/Documentation/RelNotes-1.7.0.4.txt @@ -0,0 +1,19 @@ +Git v1.7.0.4 Release Notes (draft) +================================== + +Fixes since v1.7.0.3 +-------------------- + + * Color values given to "color.." configuration can now have + more than one attributes (e.g. "bold ul"). + + * "git add -u nonexistent-path" did not complain. + + * "git apply --whitespace=fix" didn't work well when an early patch in + a patch series adds trailing blank lines and a later one depended on + such a block of blank lines at the end. + + * "git fast-export" didn't check error status and stop when marks file + cannot be opened. + +And other minor fixes and documentation updates. diff --git a/RelNotes b/RelNotes index 02e74966cd..9148d7c5c2 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.7.0.3.txt \ No newline at end of file +Documentation/RelNotes-1.7.0.4.txt \ No newline at end of file From 0acb62f202617cc58b6b4039dc9c7ad955ef0c88 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Sun, 28 Mar 2010 21:36:00 +0200 Subject: [PATCH 2/3] rebase -i: make post-rewrite work for 'edit' The post-rewrite support, in the form of the call to 'record_in_rewritten', was hidden in the arm where we have to record a new commit for the user. This meant that it was never invoked in the case where the user has already amended the commit by herself. [The test is designed to exercise both arms of the 'if' in question.] Furthermore, recording the stopped-sha (the SHA1 of the commit before the editing) suffered from a cut&paste error from die_with_patch and used the wrong variable, hence it never recorded anything. Noticed by Junio. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 5 +++-- t/t5407-post-rewrite-hook.sh | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 415ae72dbc..8a2771f1f9 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -484,7 +484,7 @@ do_next () { mark_action_done pick_one $sha1 || die_with_patch $sha1 "Could not apply $sha1... $rest" - echo "$1" > "$DOTEST"/stopped-sha + echo "$sha1" > "$DOTEST"/stopped-sha make_patch $sha1 git rev-parse --verify HEAD > "$AMEND" warn "Stopped at $sha1... $rest" @@ -732,9 +732,10 @@ first and then run 'git rebase --continue' again." test -n "$amend" && git reset --soft $amend die "Could not commit staged changes." } - record_in_rewritten "$(cat "$DOTEST"/stopped-sha)" fi + record_in_rewritten "$(cat "$DOTEST"/stopped-sha)" + require_clean_work_tree do_rest ;; diff --git a/t/t5407-post-rewrite-hook.sh b/t/t5407-post-rewrite-hook.sh index f0f91f149d..552da65a61 100755 --- a/t/t5407-post-rewrite-hook.sh +++ b/t/t5407-post-rewrite-hook.sh @@ -180,4 +180,20 @@ EOF verify_hook_input ' +test_expect_success 'git rebase -i (double edit)' ' + git reset --hard D && + clear_hook_input && + FAKE_LINES="edit 1 edit 2" git rebase -i B && + git rebase --continue && + echo something > foo && + git add foo && + git rebase --continue && + echo rebase >expected.args && + cat >expected.data < Date: Sun, 28 Mar 2010 21:57:59 -0700 Subject: [PATCH 3/3] Update draft release notes to 1.7.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt index 750d40f34a..19aeef5eff 100644 --- a/Documentation/RelNotes-1.7.1.txt +++ b/Documentation/RelNotes-1.7.1.txt @@ -7,19 +7,14 @@ Updates since v1.7.0 * Some commands (e.g. svn and http interfaces) that interactively ask password can be told to use an external program given via GIT_ASKPASS. - * Color values given to "color.." configuration can now have - more than one attributes (e.g. "bold ul"). - - * "git apply --whitespace=fix" didn't work well when an early patch in - a patch series adds trailing blank lines and a later one depended on - such a block of blank lines at the end. - * "git am" learned "--keep-cr" option to handle inputs that are mixture of changes to files with and without CRLF line endings. * "git cvsimport" learned -R option to leave revision mapping between CVS revisions and resulting git commits. + * "git diff --submodule" notices and descries dirty submodules. + * "git for-each-ref" learned %(symref), %(symref:short) and %(flag) tokens. @@ -36,11 +31,15 @@ Updates since v1.7.0 * "git grep" learned to paint filename and line-number in colors. + * "git log -p --first-parent -m" shows one-parent diff for merge + commits, instead of showing combined diff. + * "git merge-file" learned to use custom conflict marker size and also use the "union merge" behaviour. * "git notes" command has been rewritten in C and learned quite a - many commands. + many commands and features to help you carry notes forward across + rebases and amends. * "git request-pull" identifies the commit the request is relative to in a more readable way. @@ -49,6 +48,8 @@ Updates since v1.7.0 near the tip while preserving your local changes in a way similar to how "git checkout branch" does. + * "git status" notices and descries dirty submodules. + * "git svn" should work better when interacting with repositories with CRLF line endings. @@ -66,5 +67,5 @@ release, unless otherwise noted. --- exec >/var/tmp/1 echo O=$(git describe) -O=v1.7.0.2-323-g0d0925c +O=v1.7.0.3-310-g99f5b08 git shortlog --no-merges ^maint $O..