Merge branch 'pb/gitweb-tagcloud' into pb/gitweb

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 9cf873f7ebfa8f8a4fd215cbbb468f955d6a47e3..e0ded197ecabce712ac1eeaa4c959c714f0e9d34 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -91,12 +91,12 @@ for line in $FAKE_LINES; do
 done
 EOF
 
+test_set_editor "$(pwd)/fake-editor.sh"
 chmod a+x fake-editor.sh
-VISUAL="$(pwd)/fake-editor.sh"
-export VISUAL
 
 test_expect_success 'no changes are a nop' '
        git rebase -i F &&
+       test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
        test $(git rev-parse I) = $(git rev-parse HEAD)
 '
 
@@ -105,14 +105,26 @@ test_expect_success 'test the [branch] option' '
        git rm file6 &&
        git commit -m "stop here" &&
        git rebase -i F branch2 &&
+       test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
+       test $(git rev-parse I) = $(git rev-parse branch2) &&
        test $(git rev-parse I) = $(git rev-parse HEAD)
 '
 
+test_expect_success 'test --onto <branch>' '
+       git checkout -b test-onto branch2 &&
+       git rebase -i --onto branch1 F &&
+       test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
+       test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
+       test $(git rev-parse I) = $(git rev-parse branch2)
+'
+
 test_expect_success 'rebase on top of a non-conflicting commit' '
        git checkout branch1 &&
        git tag original-branch1 &&
        git rebase -i branch2 &&
        test file6 = $(git diff --name-only original-branch1) &&
+       test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
+       test $(git rev-parse I) = $(git rev-parse branch2) &&
        test $(git rev-parse I) = $(git rev-parse HEAD~2)
 '
 
@@ -145,17 +157,21 @@ EOF
 
 test_expect_success 'stop on conflicting pick' '
        git tag new-branch1 &&
-       ! git rebase -i master &&
-       test_cmp expect .git/.dotest-merge/patch &&
+       test_must_fail git rebase -i master &&
+       test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
+       test_cmp expect .git/rebase-merge/patch &&
        test_cmp expect2 file1 &&
-       test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) &&
-       test 0 = $(grep -c "^[^#]" < .git/.dotest-merge/git-rebase-todo)
+       test "$(git diff --name-status |
+               sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
+       test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
+       test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
 '
 
 test_expect_success 'abort' '
        git rebase --abort &&
        test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
-       ! test -d .git/.dotest-merge
+       test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
+       ! test -d .git/rebase-merge
 '
 
 test_expect_success 'retain authorship' '
@@ -186,6 +202,9 @@ test_expect_success 'retain authorship when squashing' '
 test_expect_success '-p handles "no changes" gracefully' '
        HEAD=$(git rev-parse HEAD) &&
        git rebase -i -p HEAD^ &&
+       git update-index --refresh &&
+       git diff-files --quiet &&
+       git diff-index --quiet --cached HEAD -- &&
        test $HEAD = $(git rev-parse HEAD)
 '
 
@@ -195,7 +214,7 @@ test_expect_success 'preserve merges with -p' '
        git add unrelated-file &&
        test_tick &&
        git commit -m "unrelated" &&
-       git checkout -b to-be-rebased master &&
+       git checkout -b another-branch master &&
        echo B > file1 &&
        test_tick &&
        git commit -m J file1 &&
@@ -204,17 +223,48 @@ test_expect_success 'preserve merges with -p' '
        echo C > file1 &&
        test_tick &&
        git commit -m K file1 &&
+       echo D > file1 &&
+       test_tick &&
+       git commit -m L1 file1 &&
+       git checkout HEAD^ &&
+       echo 1 > unrelated-file &&
+       test_tick &&
+       git commit -m L2 unrelated-file &&
+       test_tick &&
+       git merge another-branch &&
+       echo E > file1 &&
+       test_tick &&
+       git commit -m M file1 &&
+       git checkout -b to-be-rebased &&
        test_tick &&
        git rebase -i -p --onto branch1 master &&
-       test $(git rev-parse HEAD^^2) = $(git rev-parse to-be-preserved) &&
-       test $(git rev-parse HEAD~3) = $(git rev-parse branch1) &&
-       test $(git show HEAD:file1) = C &&
-       test $(git show HEAD~2:file1) = B
+       git update-index --refresh &&
+       git diff-files --quiet &&
+       git diff-index --quiet --cached HEAD -- &&
+       test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
+       test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
+       test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&
+       test $(git show HEAD~5:file1) = B &&
+       test $(git show HEAD~3:file1) = C &&
+       test $(git show HEAD:file1) = E &&
+       test $(git show HEAD:unrelated-file) = 1
+'
+
+test_expect_success 'edit ancestor with -p' '
+       FAKE_LINES="1 edit 2 3 4" git rebase -i -p HEAD~3 &&
+       echo 2 > unrelated-file &&
+       test_tick &&
+       git commit -m L2-modified --amend unrelated-file &&
+       git rebase --continue &&
+       git update-index --refresh &&
+       git diff-files --quiet &&
+       git diff-index --quiet --cached HEAD -- &&
+       test $(git show HEAD:unrelated-file) = 2
 '
 
 test_expect_success '--continue tries to commit' '
        test_tick &&
-       ! git rebase -i --onto new-branch1 HEAD^ &&
+       test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
        echo resolved > file1 &&
        git add file1 &&
        FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
@@ -225,7 +275,7 @@ test_expect_success '--continue tries to commit' '
 test_expect_success 'verbose flag is heeded, even after --continue' '
        git reset --hard HEAD@{1} &&
        test_tick &&
-       ! git rebase -v -i --onto new-branch1 HEAD^ &&
+       test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
        echo resolved > file1 &&
        git add file1 &&
        git rebase --continue > output &&
@@ -260,10 +310,14 @@ test_expect_success 'interrupted squash works as expected' '
                git commit -m $n
        done &&
        one=$(git rev-parse HEAD~3) &&
-       ! FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
+       (
+               FAKE_LINES="1 squash 3 2" &&
+               export FAKE_LINES &&
+               test_must_fail git rebase -i HEAD~3
+       ) &&
        (echo one; echo two; echo four) > conflict &&
        git add conflict &&
-       ! git rebase --continue &&
+       test_must_fail git rebase --continue &&
        echo resolved > conflict &&
        git add conflict &&
        git rebase --continue &&
@@ -278,13 +332,17 @@ test_expect_success 'interrupted squash works as expected (case 2)' '
                git commit -m $n
        done &&
        one=$(git rev-parse HEAD~3) &&
-       ! FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
+       (
+               FAKE_LINES="3 squash 1 2" &&
+               export FAKE_LINES &&
+               test_must_fail git rebase -i HEAD~3
+       ) &&
        (echo one; echo four) > conflict &&
        git add conflict &&
-       ! git rebase --continue &&
+       test_must_fail git rebase --continue &&
        (echo one; echo two; echo four) > conflict &&
        git add conflict &&
-       ! git rebase --continue &&
+       test_must_fail git rebase --continue &&
        echo resolved > conflict &&
        git add conflict &&
        git rebase --continue &&
@@ -332,7 +390,7 @@ test_expect_success 'rebase a commit violating pre-commit' '
        chmod a+x $PRE_COMMIT &&
        echo "monde! " >> file1 &&
        test_tick &&
-       ! git commit -m doesnt-verify file1 &&
+       test_must_fail git commit -m doesnt-verify file1 &&
        git commit -m doesnt-verify --no-verify file1 &&
        test_tick &&
        FAKE_LINES=2 git rebase -i HEAD~2