Skip to content

Commit

Permalink
git-am: rename apply_opt_extra file to apply-opt
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Dec 6, 2008
1 parent fe6beab commit 9b9f5a2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 '
Expand Down
1 change: 0 additions & 1 deletion t/t4252-am-options.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9b9f5a2

Please sign in to comment.