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>
Junio C Hamano committed
Dec 5, 2008 at 11:19 UTC
9b9f5a2258e6df611d2903d84fd8d41806ce0e00
2 files changed
+2
-3
git-am.sh
+2
-2
@@ -250,7 +250,7 @@ else
250
# -s, -u, -k, --whitespace, -3, -C and -p flags are kept
251
# for the resuming session after a patch failure.
252
# -i can and must be given when resuming.
253
- echo " $git_apply_opt" >"$dotest/apply_opt_extra"
253
+ echo " $git_apply_opt" >"$dotest/apply-opt"
254
echo "$threeway" >"$dotest/threeway"
255
echo "$sign" >"$dotest/sign"
256
echo "$utf8" >"$dotest/utf8"
@@ -288,7 +288,7 @@ if test "$(cat "$dotest/threeway")" = t
288
then
289
threeway=t
290
fi
291
-git_apply_opt=$(cat "$dotest/apply_opt_extra")
291
+git_apply_opt=$(cat "$dotest/apply-opt")
292
if test "$(cat "$dotest/sign")" = t
293
then
294
SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '
t/t4252-am-options.sh
-1
@@ -45,7 +45,6 @@ test_expect_success 'interrupted am -C1 -p2' '
45
rm -rf .git/rebase-apply &&
46
git reset --hard initial &&
47
test_must_fail git am -p2 -C1 "$tm"/am-test-4-? &&
48
- cat .git/rebase-apply/apply_opt_extra &&
48
git am --skip &&
49
grep 3 file-1 &&
50
grep "^Three$" file-2