undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-am: rename apply_opt_extra file to apply-opt

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2008-12-05 11:19:43 -08:00
parent fe6beab7e8
commit 9b9f5a2258
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-am.sh
View File

@ -250,7 +250,7 @@ else
# -s, -u, -k, --whitespace, -3, -C and -p flags are kept # -s, -u, -k, --whitespace, -3, -C and -p flags are kept
# for the resuming session after a patch failure. # for the resuming session after a patch failure.
# -i can and must be given when resuming. # -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 "$threeway" >"$dotest/threeway"
echo "$sign" >"$dotest/sign" echo "$sign" >"$dotest/sign"
echo "$utf8" >"$dotest/utf8" echo "$utf8" >"$dotest/utf8"
@ -288,7 +288,7 @@ if test "$(cat "$dotest/threeway")" = t
then then
threeway=t threeway=t
fi fi
git_apply_opt=$(cat "$dotest/apply_opt_extra") git_apply_opt=$(cat "$dotest/apply-opt")
if test "$(cat "$dotest/sign")" = t if test "$(cat "$dotest/sign")" = t
then then
SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e ' SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '

1
t/t4252-am-options.sh
View File

@ -45,7 +45,6 @@ test_expect_success 'interrupted am -C1 -p2' '
rm -rf .git/rebase-apply && rm -rf .git/rebase-apply &&
git reset --hard initial && git reset --hard initial &&
test_must_fail git am -p2 -C1 "$tm"/am-test-4-? && test_must_fail git am -p2 -C1 "$tm"/am-test-4-? &&
cat .git/rebase-apply/apply_opt_extra &&
git am --skip && git am --skip &&
grep 3 file-1 && grep 3 file-1 &&
grep "^Three$" file-2 grep "^Three$" file-2