rebase -i -p: fix parent rewriting

The existing parent rewriting did not handle the case where a previous
commit was amended (via edit or squash).  Fix by always putting the
new sha1 of the last commit into the $REWRITTEN map.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 58126bd80cd73993c6cedd548e200c0fa461a8af..929d681c4716fa4f6b2947fdb40ad6fbb580bef3 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -165,14 +165,14 @@ pick_one_preserving_merges () {
                die "Cannot write current commit's replacement sha1"
        fi
 
                die "Cannot write current commit's replacement sha1"
        fi
 

+       echo $sha1 > "$DOTEST"/current-commit
+

        # rewrite parents; if none were rewritten, we can fast-forward.
        # rewrite parents; if none were rewritten, we can fast-forward.

-       preserve=t

        new_parents=
        for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -f2-)
        do
                if test -f "$REWRITTEN"/$p
                then
        new_parents=
        for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -f2-)
        do
                if test -f "$REWRITTEN"/$p
                then

-                       preserve=f

                        new_p=$(cat "$REWRITTEN"/$p)
                        test $p != $new_p && fast_forward=f
                        case "$new_parents" in
                        new_p=$(cat "$REWRITTEN"/$p)
                        test $p != $new_p && fast_forward=f
                        case "$new_parents" in


@@ -189,7 +189,6 @@ pick_one_preserving_merges () {
        case $fast_forward in
        t)
                output warn "Fast forward to $sha1"
        case $fast_forward in
        t)
                output warn "Fast forward to $sha1"

-               test $preserve = f || echo $sha1 > "$REWRITTEN"/$sha1

                output git reset --hard $sha1 ||
                        die "Cannot fast forward to $sha1"
                ;;
                output git reset --hard $sha1 ||
                        die "Cannot fast forward to $sha1"
                ;;


@@ -201,7 +200,6 @@ pick_one_preserving_merges () {
                output git checkout $first_parent 2> /dev/null ||
                        die "Cannot move HEAD to $first_parent"
 
                output git checkout $first_parent 2> /dev/null ||
                        die "Cannot move HEAD to $first_parent"
 

-               echo $sha1 > "$DOTEST"/current-commit

                case "$new_parents" in
                ' '*' '*)
                        # redo merge
                case "$new_parents" in
                ' '*' '*)
                        # redo merge

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 4d62b9af838b306d0c815d852422949e968b10fb..5aa487ac02fc93c9ddbef85e430795543b976b60 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -250,6 +250,18 @@ test_expect_success 'preserve merges with -p' '
        test $(git show HEAD:unrelated-file) = 1
 '
 
        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 &&
        test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
 test_expect_success '--continue tries to commit' '
        test_tick &&
        test_must_fail git rebase -i --onto new-branch1 HEAD^ &&