diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:02 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:02 +0300 |
| commit | 9ca488c04bdab90668471640baeb0d9140be064c (patch) | |
| tree | 6a1e4c6acaff06f234b12fdbb0b4ad9ab3bc8048 /t/t4150-am.sh | |
| parent | 2cd91ec1970bd89e6b4b79b5aa41f27435625e71 (diff) | |
| parent | fbd7a23237094c3fb2e249bbcacbbf1e858e79c9 (diff) | |
Merge branch 'nd/rebase-show-current-patch'
The new "--show-current-patch" option gives an end-user facing way
to get the diff being applied when "git rebase" (and "git am")
stops with a conflict.
* nd/rebase-show-current-patch:
rebase: introduce and use pseudo-ref REBASE_HEAD
rebase: add --show-current-patch
am: add --show-current-patch
Diffstat (limited to 't/t4150-am.sh')
| -rwxr-xr-x | t/t4150-am.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 512c754e02..1eccfb71d0 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -662,6 +662,11 @@ test_expect_success 'am pauses on conflict' ' test -d .git/rebase-apply ' +test_expect_success 'am --show-current-patch' ' + git am --show-current-patch >actual.patch && + test_cmp .git/rebase-apply/0001 actual.patch +' + test_expect_success 'am --skip works' ' echo goodbye >expected && git am --skip && |