diff options
| author | martin f. krafft <madduck@madduck.net> | 2009-01-23 11:31:21 +1100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-23 17:00:12 -0800 |
| commit | b80da424a13107c239ed40573fae3d692d19b6cd (patch) | |
| tree | 48fd506aeee6cc46c23f2c0b1ef43db37b382ae0 /t | |
| parent | d930508903909ad5e700dd25e3858a1b2d69ed12 (diff) | |
| download | git-b80da424a13107c239ed40573fae3d692d19b6cd.tar.gz git-b80da424a13107c239ed40573fae3d692d19b6cd.tar.xz | |
git-am: implement --reject option passed to git-apply
With --reject, git-am simply passes the --reject option to git-apply and thus
allows people to work with reject files if they so prefer.
Signed-off-by: martin f. krafft <madduck@madduck.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4252-am-options.sh | 11 | ||||
| -rw-r--r-- | t/t4252/am-test-6-1 | 21 |
2 files changed, 31 insertions, 1 deletions
diff --git a/t/t4252-am-options.sh b/t/t4252-am-options.sh index 5fdd18858..f603c1b13 100755 --- a/t/t4252-am-options.sh +++ b/t/t4252-am-options.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='git am not losing options' +test_description='git am with options and not losing them' . ./test-lib.sh tm="$TEST_DIRECTORY/t4252" @@ -66,4 +66,13 @@ test_expect_success 'apply to a funny path' ' test -f "$with_sq/file-5" ' +test_expect_success 'am --reject' ' + rm -rf .git/rebase-apply && + git reset --hard initial && + test_must_fail git am --reject "$tm"/am-test-6-1 && + grep "@@ -1,3 +1,3 @@" file-2.rej && + test_must_fail git diff-files --exit-code --quiet file-2 && + grep "[-]-reject" .git/rebase-apply/apply-opt +' + test_done diff --git a/t/t4252/am-test-6-1 b/t/t4252/am-test-6-1 new file mode 100644 index 000000000..a8859e9b8 --- /dev/null +++ b/t/t4252/am-test-6-1 @@ -0,0 +1,21 @@ +From: A U Thor <au.thor@example.com> +Date: Thu Dec 4 16:00:00 2008 -0800 +Subject: Huh + +Should fail and leave rejects + +diff --git i/file-2 w/file-2 +index 06e567b..b6f3a16 100644 +--- i/file-2 ++++ w/file-2 +@@ -1,3 +1,3 @@ +-0 ++One + 2 + 3 +@@ -4,4 +4,4 @@ + 4 + 5 +-6 ++Six + 7 |