From b47dfe9e9c86be97fc07c4c04e26a303730f76c6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 11 Jan 2009 22:21:48 -0800 Subject: git-am: add --directory= option Thanks to a200337 (git-am: propagate -C, -p 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 --- t/t4252-am-options.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 't/t4252-am-options.sh') diff --git a/t/t4252-am-options.sh b/t/t4252-am-options.sh index 3ab9e8e6e3..e91a6da0d5 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 -- cgit v1.2.3