From: Junio C Hamano Date: Fri, 05 Dec 2008 19:18:43 GMT Subject: Re: [PATCH 2/4] git-am: propagate -C, -p options as well Message-ID: <7v7i6e1ld8.fsf@gitster.siamese.dyndns.org> In-Reply-To: Johannes Schindelin writes: > On Thu, 4 Dec 2008, Junio C Hamano wrote: > >> - echo " $ws" >"$dotest/whitespace" >> + echo " $git_apply_opt" >"$dotest/apply_opt_extra" > >>From the other scripts, it appears we have sort of a convention to use > dashes instead of underscores for file names (see e.g. > $dotest/patch-merge-tmp-dir). You are right. And there is no reason to call it "extra" either. git-am.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git c/git-am.sh w/git-am.sh index 13c02d6..4b157fe 100755 --- c/git-am.sh +++ w/git-am.sh @@ -250,7 +250,7 @@ else # -s, -u, -k, --whitespace, -3, -C and -p flags are kept # for the resuming session after a patch failure. # -i can and must be given when resuming. - echo " $git_apply_opt" >"$dotest/apply_opt_extra" + echo " $git_apply_opt" >"$dotest/apply-opt" echo "$threeway" >"$dotest/threeway" echo "$sign" >"$dotest/sign" echo "$utf8" >"$dotest/utf8" @@ -288,7 +288,7 @@ if test "$(cat "$dotest/threeway")" = t then threeway=t fi -git_apply_opt=$(cat "$dotest/apply_opt_extra") +git_apply_opt=$(cat "$dotest/apply-opt") if test "$(cat "$dotest/sign")" = t then SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '