diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-11 16:43:27 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-12 14:07:59 -0800 |
| commit | 66335298a47032267edd6d6e7a71cc337e46e995 (patch) | |
| tree | 547baec4b4e0f79368fac37c21ed84e0effef503 /t/t3404-rebase-interactive.sh | |
| parent | am: add --show-current-patch (diff) | |
| download | tgif-66335298a47032267edd6d6e7a71cc337e46e995.tar.xz | |
rebase: add --show-current-patch
It is useful to see the full patch while resolving conflicts in a
rebase. The only way to do it now is
less .git/rebase-*/patch
which could turn out to be a lot longer to type if you are in a
linked worktree, or not at top-dir. On top of that, an ordinary user
should not need to peek into .git directory. The new option is
provided to examine the patch.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 481a350090..3af6f149a9 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -225,6 +225,11 @@ test_expect_success 'stop on conflicting pick' ' test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo) ' +test_expect_success 'show conflicted patch' ' + GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr && + grep "show.*$(cat "$state_dir/stopped-sha")" stderr +' + test_expect_success 'abort' ' git rebase --abort && test $(git rev-parse new-branch1) = $(git rev-parse HEAD) && |