Merge branch 'kc/maint-diff-bwi-fix' into maint

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index 13c02d6adecdc469aa8e02a758c2c3e7aef0306a..4b157fe5d536fdbdbf85e0e06c419b5927a90867 100755 (executable)
--- 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 '