From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jul 2019 22:25:39 +0000 (-0700)
Subject: Merge branch 'js/t3404-typofix'
X-Git-Tag: v2.23.0-rc0~79
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a56a7777bdf7a812fafb45663db26c5f4d988e52?hp=-c

Merge branch 'js/t3404-typofix'

Typofix.

* js/t3404-typofix:
t3404: fix a typo
---

a56a7777bdf7a812fafb45663db26c5f4d988e52
diff --combined t/t3404-rebase-interactive.sh
index 1723e1a858,64b553ebe0..46d971b4ef
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -75,16 -75,6 +75,16 @@@ test_expect_success 'rebase --keep-empt
  	test_line_count = 6 actual
  '
  
 +cat > expect <<EOF
 +error: nothing to do
 +EOF
 +
 +test_expect_success 'rebase -i with empty HEAD' '
 +	set_fake_editor &&
 +	test_must_fail env FAKE_LINES="1 exec_true" git rebase -i HEAD^ >actual 2>&1 &&
 +	test_i18ncmp expect actual
 +'
 +
  test_expect_success 'rebase -i with the exec command' '
  	git checkout master &&
  	(
@@@ -124,20 -114,11 +124,20 @@@ test_expect_success 'rebase -i with exe
  	git checkout master &&
  	mkdir subdir && (cd subdir &&
  	set_fake_editor &&
 -	FAKE_LINES="1 exec_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
 +	FAKE_LINES="1 x_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
  		git rebase -i HEAD^
  	)
  '
  
 +test_expect_success 'rebase -i sets work tree properly' '
 +	test_when_finished "rm -rf subdir" &&
 +	test_when_finished "test_might_fail git rebase --abort" &&
 +	mkdir subdir &&
 +	git rebase -x "(cd subdir && git rev-parse --show-toplevel)" HEAD^ \
 +		>actual &&
 +	! grep "/subdir$" actual
 +'
 +
  test_expect_success 'rebase -i with the exec command checks tree cleanness' '
  	git checkout master &&
  	set_fake_editor &&
@@@ -147,25 -128,6 +147,25 @@@
  	git rebase --continue
  '
  
 +test_expect_success 'rebase -x with empty command fails' '
 +	test_when_finished "git rebase --abort ||:" &&
 +	test_must_fail env git rebase -x "" @ 2>actual &&
 +	test_write_lines "error: empty exec command" >expected &&
 +	test_i18ncmp expected actual &&
 +	test_must_fail env git rebase -x " " @ 2>actual &&
 +	test_i18ncmp expected actual
 +'
 +
 +LF='
 +'
 +test_expect_success 'rebase -x with newline in command fails' '
 +	test_when_finished "git rebase --abort ||:" &&
 +	test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
 +	test_write_lines "error: exec commands cannot contain newlines" \
 +			 >expected &&
 +	test_i18ncmp expected actual
 +'
 +
  test_expect_success 'rebase -i with exec of inexistent command' '
  	git checkout master &&
  	test_when_finished "git rebase --abort" &&
@@@ -175,11 -137,6 +175,11 @@@
  	! grep "Maybe git-rebase is broken" actual
  '
  
 +test_expect_success 'implicit interactive rebase does not invoke sequence editor' '
 +	test_when_finished "git rebase --abort ||:" &&
 +	GIT_SEQUENCE_EDITOR="echo bad >" git rebase -x"echo one" @^
 +'
 +
  test_expect_success 'no changes are a nop' '
  	git checkout branch2 &&
  	set_fake_editor &&
@@@ -307,18 -264,11 +307,18 @@@ test_expect_success 'retain authorship
  '
  
  test_expect_success 'retain authorship w/ conflicts' '
 +	oGIT_AUTHOR_NAME=$GIT_AUTHOR_NAME &&
 +	test_when_finished "GIT_AUTHOR_NAME=\$oGIT_AUTHOR_NAME" &&
 +
  	git reset --hard twerp &&
  	test_commit a conflict a conflict-a &&
  	git reset --hard twerp &&
 -	GIT_AUTHOR_NAME=AttributeMe \
 +
 +	GIT_AUTHOR_NAME=AttributeMe &&
 +	export GIT_AUTHOR_NAME &&
  	test_commit b conflict b conflict-b &&
 +	GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&
 +
  	set_fake_editor &&
  	test_must_fail git rebase -i conflict-a &&
  	echo resolved >conflict &&
@@@ -346,7 -296,7 +346,7 @@@ test_expect_success 'retain authorship 
  	git show HEAD | grep "^Author: Twerp Snog"
  '
  
 -test_expect_success '-p handles "no changes" gracefully' '
 +test_expect_success REBASE_P '-p handles "no changes" gracefully' '
  	HEAD=$(git rev-parse HEAD) &&
  	set_fake_editor &&
  	git rebase -i -p HEAD^ &&
@@@ -356,7 -306,7 +356,7 @@@
  	test $HEAD = $(git rev-parse HEAD)
  '
  
 -test_expect_failure 'exchange two commits with -p' '
 +test_expect_failure REBASE_P 'exchange two commits with -p' '
  	git checkout H &&
  	set_fake_editor &&
  	FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
@@@ -364,7 -314,7 +364,7 @@@
  	test G = $(git cat-file commit HEAD | sed -ne \$p)
  '
  
 -test_expect_success 'preserve merges with -p' '
 +test_expect_success REBASE_P 'preserve merges with -p' '
  	git checkout -b to-be-preserved master^ &&
  	: > unrelated-file &&
  	git add unrelated-file &&
@@@ -407,7 -357,7 +407,7 @@@
  	test $(git show HEAD:unrelated-file) = 1
  '
  
 -test_expect_success 'edit ancestor with -p' '
 +test_expect_success REBASE_P 'edit ancestor with -p' '
  	set_fake_editor &&
  	FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3 &&
  	echo 2 > unrelated-file &&
@@@ -421,7 -371,6 +421,7 @@@
  '
  
  test_expect_success '--continue tries to commit' '
 +	git reset --hard D &&
  	test_tick &&
  	set_fake_editor &&
  	test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
@@@ -461,7 -410,7 +461,7 @@@ test_expect_success C_LOCALE_OUTPUT 'mu
  		git rebase -i $base &&
  	test $base = $(git rev-parse HEAD^) &&
  	test 0 = $(git show | grep NEVER | wc -l) &&
 -	git checkout to-be-rebased &&
 +	git checkout @{-1} &&
  	git branch -D multi-fixup
  '
  
@@@ -476,7 -425,7 +476,7 @@@ test_expect_success 'commit message use
  		git rebase --continue &&
  	test $base = $(git rev-parse HEAD^) &&
  	test 1 = $(git show | grep ONCE | wc -l) &&
 -	git checkout to-be-rebased &&
 +	git checkout @{-1} &&
  	git branch -D conflict-fixup
  '
  
@@@ -491,7 -440,7 +491,7 @@@ test_expect_success 'commit message ret
  		git rebase --continue &&
  	test $base = $(git rev-parse HEAD^) &&
  	test 2 = $(git show | grep TWICE | wc -l) &&
 -	git checkout to-be-rebased &&
 +	git checkout @{-1} &&
  	git branch -D conflict-squash
  '
  
@@@ -516,7 -465,7 +516,7 @@@ test_expect_success C_LOCALE_OUTPUT 'sq
  		grep "^# This is a combination of 3 commits\."  &&
  	git cat-file commit HEAD@{3} |
  		grep "^# This is a combination of 2 commits\."  &&
 -	git checkout to-be-rebased &&
 +	git checkout @{-1} &&
  	git branch -D squash-fixup
  '
  
@@@ -529,7 -478,7 +529,7 @@@ test_expect_success C_LOCALE_OUTPUT 'sq
  		git rebase -i $base &&
  	test $base = $(git rev-parse HEAD^) &&
  	test 1 = $(git show | grep ONCE | wc -l) &&
 -	git checkout to-be-rebased &&
 +	git checkout @{-1} &&
  	git branch -D skip-comments
  '
  
@@@ -542,7 -491,7 +542,7 @@@ test_expect_success C_LOCALE_OUTPUT 'sq
  		git rebase -i $base &&
  	test $base = $(git rev-parse HEAD^) &&
  	test 1 = $(git show | grep ONCE | wc -l) &&
 -	git checkout to-be-rebased &&
 +	git checkout @{-1} &&
  	git branch -D skip-blank-lines
  '
  
@@@ -550,7 -499,7 +550,7 @@@ test_expect_success 'squash works as ex
  	git checkout -b squash-works no-conflict-branch &&
  	one=$(git rev-parse HEAD~3) &&
  	set_fake_editor &&
 -	FAKE_LINES="1 squash 3 2" EXPECT_HEADER_COUNT=2 \
 +	FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 \
  		git rebase -i HEAD~3 &&
  	test $one = $(git rev-parse HEAD~2)
  '
@@@ -560,7 -509,7 +560,7 @@@ test_expect_success 'interrupted squas
  	one=$(git rev-parse HEAD~3) &&
  	set_fake_editor &&
  	test_must_fail env FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
 -	(echo one; echo two; echo four) > conflict &&
 +	test_write_lines one two four > conflict &&
  	git add conflict &&
  	test_must_fail git rebase --continue &&
  	echo resolved > conflict &&
@@@ -574,10 -523,10 +574,10 @@@ test_expect_success 'interrupted squas
  	one=$(git rev-parse HEAD~3) &&
  	set_fake_editor &&
  	test_must_fail env FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
 -	(echo one; echo four) > conflict &&
 +	test_write_lines one four > conflict &&
  	git add conflict &&
  	test_must_fail git rebase --continue &&
 -	(echo one; echo two; echo four) > conflict &&
 +	test_write_lines one two four > conflict &&
  	git add conflict &&
  	test_must_fail git rebase --continue &&
  	echo resolved > conflict &&
@@@ -683,7 -632,7 +683,7 @@@ test_expect_success 'rebase with a fil
  	) &&
  
  	set_fake_editor &&
 -	FAKE_LINES="1 squash 2" git rebase -i to-be-rebased &&
 +	FAKE_LINES="1 squash 2" git rebase -i @{-1} &&
  	test "$(git show -s --pretty=format:%an)" = "Squashed Away"
  
  '
@@@ -783,7 -732,7 +783,7 @@@ test_expect_success 'reword' 
  	git show HEAD^ | grep "D changed" &&
  	FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" git rebase -i A &&
  	git show HEAD~3 | grep "B changed" &&
 -	FAKE_LINES="1 reword 2 3 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A &&
 +	FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A &&
  	git show HEAD~2 | grep "C changed"
  '
  
@@@ -809,7 -758,7 +809,7 @@@ test_expect_success 'rebase -i can cop
  	git reset --hard n3 &&
  	git notes add -m"an earlier note" n2 &&
  	set_fake_editor &&
 -	GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 fixup 2" git rebase -i n1 &&
 +	GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" git rebase -i n1 &&
  	git notes show > output &&
  	test_cmp expect output
  '
@@@ -830,15 -779,16 +830,15 @@@ test_expect_success 'always cherry-pic
  	git tag original-no-ff-branch &&
  	set_fake_editor &&
  	git rebase -i --no-ff A &&
 -	touch empty &&
  	for p in 0 1 2
  	do
  		test ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) &&
  		git diff HEAD~$p original-no-ff-branch~$p > out &&
 -		test_cmp empty out
 +		test_must_be_empty out
  	done &&
  	test $(git rev-parse HEAD~3) = $(git rev-parse original-no-ff-branch~3) &&
  	git diff HEAD~3 original-no-ff-branch~3 > out &&
 -	test_cmp empty out
 +	test_must_be_empty out
  '
  
  test_expect_success 'set up commits with funny messages' '
@@@ -1031,7 -981,7 +1031,7 @@@ test_expect_success 'rebase -i --root r
  	test -z "$(git show -s --format=%p HEAD^)"
  '
  
- test_expect_success 'rebase -i --root when root has untracked file confilct' '
+ test_expect_success 'rebase -i --root when root has untracked file conflict' '
  	test_when_finished "reset_rebase" &&
  	git checkout -b failing-root-pick A &&
  	echo x >file2 &&
@@@ -1280,13 -1230,13 +1280,13 @@@ rebase_setup_and_clean () 
  		test_might_fail git branch -D $1 &&
  		test_might_fail git rebase --abort
  	" &&
 -	git checkout -b $1 master
 +	git checkout -b $1 ${2:-master}
  }
  
  test_expect_success 'drop' '
  	rebase_setup_and_clean drop-test &&
  	set_fake_editor &&
 -	FAKE_LINES="1 drop 2 3 drop 4 5" git rebase -i --root &&
 +	FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root &&
  	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
  	test C = $(git cat-file commit HEAD^ | sed -ne \$p) &&
  	test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
@@@ -1457,24 -1407,4 +1457,24 @@@ test_expect_success 'rebase -i --gpg-si
  	test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
  '
  
 +test_expect_success 'valid author header after --root swap' '
 +	rebase_setup_and_clean author-header no-conflict-branch &&
 +	set_fake_editor &&
 +	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
 +	git cat-file commit HEAD | grep ^author >expected &&
 +	FAKE_LINES="5 1" git rebase -i --root &&
 +	git cat-file commit HEAD^ | grep ^author >actual &&
 +	test_cmp expected actual
 +'
 +
 +test_expect_success 'valid author header when author contains single quote' '
 +	rebase_setup_and_clean author-header no-conflict-branch &&
 +	set_fake_editor &&
 +	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
 +	git cat-file commit HEAD | grep ^author >expected &&
 +	FAKE_LINES="2" git rebase -i HEAD~2 &&
 +	git cat-file commit HEAD | grep ^author >actual &&
 +	test_cmp expected actual
 +'
 +
  test_done