diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-12 06:21:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-12 10:26:01 (GMT) |
| commit | b47dfe9e9c86be97fc07c4c04e26a303730f76c6 (patch) | |
| tree | ac70929812c01e40e797abf3c53cbf13bc53ccdc /t/t4252-am-options.sh | |
| parent | d727f676ad9f03c2b2a11ea68a2c6242ca02fa10 (diff) | |
| download | git-b47dfe9e9c86be97fc07c4c04e26a303730f76c6.zip git-b47dfe9e9c86be97fc07c4c04e26a303730f76c6.tar.gz git-b47dfe9e9c86be97fc07c4c04e26a303730f76c6.tar.bz2 | |
git-am: add --directory=<dir> option
Thanks to a200337 (git-am: propagate -C<n>, -p<n> options as well,
2008-12-04) and commits around it, "git am" is equipped to correctly
propagate the command line flags such as -C/-p/-whitespace across a patch
failure and restart.
It is trivial to support --directory option now, resurrecting previous
attempts by Kevin and Simon.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4252-am-options.sh')
| -rwxr-xr-x | t/t4252-am-options.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t4252-am-options.sh b/t/t4252-am-options.sh index 3ab9e8e..e91a6da 100755 --- a/t/t4252-am-options.sh +++ b/t/t4252-am-options.sh @@ -50,4 +50,12 @@ test_expect_success 'interrupted am -C1 -p2' ' grep "^Three$" file-2 ' +test_expect_success 'interrupted am --directory="frotz nitfol"' ' + rm -rf .git/rebase-apply && + git reset --hard initial && + test_must_fail git am --directory="frotz nitfol" "$tm"/am-test-5-? && + git am --skip && + grep One "frotz nitfol/file-5" +' + test_done |