From 17f26a9ee3298dfa0a1df7cd4e5f5f32342e5f62 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Jan 2009 16:29:59 -0800 Subject: [PATCH] git-am: fix shell quoting Noticed by Stephan Beyer; the new test is mine. Signed-off-by: Junio C Hamano --- git-am.sh | 2 +- t/t4252-am-options.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/git-am.sh b/git-am.sh index 7e6329b14c..4beb12dcf5 100755 --- a/git-am.sh +++ b/git-am.sh @@ -38,7 +38,7 @@ sq () { for sqarg do printf "%s" "$sqarg" | - sed -e 's/'\''/'\''\'\'''\''/g' -e 's/.*/ '\''&'\''/' + sed -e 's/'\''/'\''\\'\'''\''/g' -e 's/.*/ '\''&'\''/' done } diff --git a/t/t4252-am-options.sh b/t/t4252-am-options.sh index e91a6da0d5..5fdd188582 100755 --- a/t/t4252-am-options.sh +++ b/t/t4252-am-options.sh @@ -58,4 +58,12 @@ test_expect_success 'interrupted am --directory="frotz nitfol"' ' grep One "frotz nitfol/file-5" ' +test_expect_success 'apply to a funny path' ' + with_sq="with'\''sq" + rm -fr .git/rebase-apply && + git reset --hard initial && + git am --directory="$with_sq" "$tm"/am-test-5-2 && + test -f "$with_sq/file-5" +' + test_done