diff options
| -rwxr-xr-x | git-am.sh | 4 | ||||
| -rwxr-xr-x | t/t4252-am-options.sh | 1 |
2 files changed, 2 insertions, 3 deletions
@@ -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 ' diff --git a/t/t4252-am-options.sh b/t/t4252-am-options.sh index 1a1946dd97..3ab9e8e6e3 100755 --- a/t/t4252-am-options.sh +++ b/t/t4252-am-options.sh @@ -45,7 +45,6 @@ test_expect_success 'interrupted am -C1 -p2' ' rm -rf .git/rebase-apply && git reset --hard initial && test_must_fail git am -p2 -C1 "$tm"/am-test-4-? && - cat .git/rebase-apply/apply_opt_extra && git am --skip && grep 3 file-1 && grep "^Three$" file-2 |