summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-05 11:19:43 -0800
committerJunio C Hamano <gitster@pobox.com>2008-12-05 20:02:10 -0800
commit9b9f5a2258e6df611d2903d84fd8d41806ce0e00 (patch)
tree44ae4af3938c4c927319e533495a77bae20f0408 /git-am.sh
parentfe6beab7e80565dac81125aa82521f7673905ebc (diff)
downloadgit-9b9f5a2258e6df611d2903d84fd8d41806ce0e00.tar.gz
git-am: rename apply_opt_extra file to apply-opt
All other state files use dash in their names, not underscores. Also, there is no reason to call this "extra". Drop it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index 13c02d6ade..4b157fe5d5 100755
--- a/git-am.sh
+++ b/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 '