diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-11 10:43:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-12 23:07:59 +0100 |
| commit | 984913a210bb6d17fb3dd515975930661a00c3b5 (patch) | |
| tree | 293e44785b3d2a934a9178385b0076758d080576 /t/t4150-am.sh | |
| parent | First batch after 2.16 (diff) | |
| download | git-984913a210bb6d17fb3dd515975930661a00c3b5.tar.xz git-984913a210bb6d17fb3dd515975930661a00c3b5.zip | |
am: add --show-current-patch
Pointing the user to $GIT_DIR/rebase-apply may encourage them to mess
around in there, which is not a good thing. With this, the user does
not have to keep the path around somewhere (because after a couple of
commands, the path may be out of scrollback buffer) when they need to
look at 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/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 73b67b4280..23abf42abc 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 && |