2007-01-15 06:00:02 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='test cherry-pick and revert with renames
|
|
|
|
|
|
|
|
--
|
|
|
|
+ rename2: renames oops to opos
|
|
|
|
+ rename1: renames oops to spoo
|
|
|
|
+ added: adds extra line to oops
|
|
|
|
++ initial: has lines in oops
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
|
|
|
|
for l in a b c d e f g h i j k l m n o
|
|
|
|
do
|
|
|
|
echo $l$l$l$l$l$l$l$l$l
|
|
|
|
done >oops &&
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
git add oops &&
|
|
|
|
git commit -m initial &&
|
|
|
|
git tag initial &&
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
echo "Add extra line at the end" >>oops &&
|
|
|
|
git commit -a -m added &&
|
|
|
|
git tag added &&
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
git mv oops spoo &&
|
|
|
|
git commit -m rename1 &&
|
|
|
|
git tag rename1 &&
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
git checkout -b side initial &&
|
|
|
|
git mv oops opos &&
|
|
|
|
git commit -m rename2 &&
|
|
|
|
git tag rename2
|
|
|
|
'
|
|
|
|
|
2010-06-14 05:32:09 +00:00
|
|
|
test_expect_success 'cherry-pick --nonsense' '
|
|
|
|
|
|
|
|
pos=$(git rev-parse HEAD) &&
|
|
|
|
git diff --exit-code HEAD &&
|
|
|
|
test_must_fail git cherry-pick --nonsense 2>msg &&
|
|
|
|
git diff --exit-code HEAD "$pos" &&
|
2012-08-27 05:36:55 +00:00
|
|
|
test_i18ngrep '[Uu]sage:' msg
|
2010-06-14 05:32:09 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'revert --nonsense' '
|
|
|
|
|
|
|
|
pos=$(git rev-parse HEAD) &&
|
|
|
|
git diff --exit-code HEAD &&
|
|
|
|
test_must_fail git revert --nonsense 2>msg &&
|
|
|
|
git diff --exit-code HEAD "$pos" &&
|
2012-08-27 05:36:55 +00:00
|
|
|
test_i18ngrep '[Uu]sage:' msg
|
2010-06-14 05:32:09 +00:00
|
|
|
'
|
|
|
|
|
2007-01-15 06:00:02 +00:00
|
|
|
test_expect_success 'cherry-pick after renaming branch' '
|
|
|
|
|
|
|
|
git checkout rename2 &&
|
2007-11-02 15:33:07 +00:00
|
|
|
git cherry-pick added &&
|
2009-01-15 13:03:17 +00:00
|
|
|
test $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
|
2007-01-15 06:00:02 +00:00
|
|
|
test -f opos &&
|
2010-06-12 16:05:12 +00:00
|
|
|
grep "Add extra line at the end" opos &&
|
|
|
|
git reflog -1 | grep cherry-pick
|
2007-01-15 06:00:02 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'revert after renaming branch' '
|
|
|
|
|
|
|
|
git checkout rename1 &&
|
2007-11-02 15:33:07 +00:00
|
|
|
git revert added &&
|
2009-01-15 13:03:17 +00:00
|
|
|
test $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
|
2007-01-15 06:00:02 +00:00
|
|
|
test -f spoo &&
|
2010-06-12 16:05:12 +00:00
|
|
|
! grep "Add extra line at the end" spoo &&
|
|
|
|
git reflog -1 | grep revert
|
2007-01-15 06:00:02 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2010-10-31 19:59:33 +00:00
|
|
|
test_expect_success 'cherry-pick on stat-dirty working tree' '
|
|
|
|
git clone . copy &&
|
|
|
|
(
|
|
|
|
cd copy &&
|
|
|
|
git checkout initial &&
|
2018-03-24 07:44:31 +00:00
|
|
|
test-tool chmtime +40 oops &&
|
2010-10-31 19:59:33 +00:00
|
|
|
git cherry-pick added
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2011-04-12 23:23:01 +00:00
|
|
|
test_expect_success 'revert forbidden on dirty working tree' '
|
2008-03-03 06:30:56 +00:00
|
|
|
|
|
|
|
echo content >extra_file &&
|
|
|
|
git add extra_file &&
|
|
|
|
test_must_fail git revert HEAD 2>errors &&
|
2016-10-21 12:26:25 +00:00
|
|
|
test_i18ngrep "your local changes would be overwritten by " errors
|
2008-03-03 06:30:56 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2013-09-05 21:51:17 +00:00
|
|
|
test_expect_success 'cherry-pick on unborn branch' '
|
2012-12-21 19:10:11 +00:00
|
|
|
git checkout --orphan unborn &&
|
|
|
|
git rm --cached -r . &&
|
|
|
|
rm -rf * &&
|
|
|
|
git cherry-pick initial &&
|
|
|
|
git diff --quiet initial &&
|
|
|
|
! test_cmp_rev initial HEAD
|
|
|
|
'
|
|
|
|
|
2013-09-05 14:57:23 +00:00
|
|
|
test_expect_success 'cherry-pick "-" to pick from previous branch' '
|
|
|
|
git checkout unborn &&
|
|
|
|
test_commit to-pick actual content &&
|
|
|
|
git checkout master &&
|
|
|
|
git cherry-pick - &&
|
|
|
|
echo content >expect &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'cherry-pick "-" is meaningless without checkout' '
|
|
|
|
test_create_repo afresh &&
|
|
|
|
(
|
|
|
|
cd afresh &&
|
|
|
|
test_commit one &&
|
|
|
|
test_commit two &&
|
|
|
|
test_commit three &&
|
|
|
|
test_must_fail git cherry-pick -
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-10-10 16:41:17 +00:00
|
|
|
test_expect_success 'cherry-pick "-" works with arguments' '
|
|
|
|
git checkout -b side-branch &&
|
|
|
|
test_commit change actual change &&
|
|
|
|
git checkout master &&
|
|
|
|
git cherry-pick -s - &&
|
|
|
|
echo "Signed-off-by: C O Mitter <committer@example.com>" >expect &&
|
|
|
|
git cat-file commit HEAD | grep ^Signed-off-by: >signoff &&
|
|
|
|
test_cmp expect signoff &&
|
|
|
|
echo change >expect &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2018-04-19 17:58:18 +00:00
|
|
|
test_expect_success 'cherry-pick works with dirty renamed file' '
|
2016-11-26 12:48:02 +00:00
|
|
|
test_commit to-rename &&
|
|
|
|
git checkout -b unrelated &&
|
|
|
|
test_commit unrelated &&
|
|
|
|
git checkout @{-1} &&
|
|
|
|
git mv to-rename.t renamed &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m renamed &&
|
|
|
|
echo modified >renamed &&
|
merge-recursive: improve add_cacheinfo error handling
Four closely related changes all with the purpose of fixing error handling
in this function:
- fix reported function name in add_cacheinfo error messages
- differentiate between the two error messages
- abort early when we hit the error (stop ignoring return code)
- mark a test which was hitting this error as failing until we get the
right fix
In more detail...
In commit 0424138d5715 ("Fix bogus error message from merge-recursive
error path", 2007-04-01), it was noted that the name of the function which
the error message claimed it was reported from did not match the actual
function name. This was changed to something closer to the real function
name, but it still didn't match the actual function name. Fix the
reported name to match.
Second, the two errors in this function had identical messages, preventing
us from knowing which error had been triggered. Add a couple words to the
second error message to differentiate the two.
Next, make sure callers do not ignore the return code so that it will stop
processing further entries (processing further entries could result in
more output which could cause the error to scroll off the screen, or at
least be missed by the user) and make it clear the error is the cause of
the early abort. These errors should never be triggered in production; if
either one is, it represents a bug in the calling path somewhere and is
likely to have resulted in mis-merged content. The combination of
ignoring of the return code and continuing to print other standard
messages after hitting the error resulted in the following bug report from
Junio: "...the command pretends that everything went well and merged
cleanly in that path...[Behaving] in a buggy and unexplainable way is bad
enough, doing so silently is unexcusable." Fix this.
Finally, there was one test in the testsuite that did hit this error path,
but was passing anyway. This would have been easy to miss since it had a
test_must_fail and thus could have failed for the wrong reason, but in a
separate testing step I added an intentional NULL-dereference to the
codepath where these error messages are printed in order to flush out such
cases. I could modify that test to explicitly check for this error and
fail the test if it is hit, but since this test operates in a bit of a
gray area and needed other changes, I went for a different fix. The gray
area this test operates in is the following: If the merge of a certain
file results in the same version of the file that existed in HEAD, but
there are dirty modifications to the file, is that an error with a
"Refusing to overwrite existing file" expected, or a case where the merge
should succeed since we shouldn't have to touch the dirty file anyway?
Recent discussion on the list leaned towards saying it should be a
success. Therefore, change the expected behavior of this test to match.
As a side effect, this makes the failed-due-to-hitting-add_cacheinfo-error
very clear, and we can mark the test as test_expect_failure. A subsequent
commit will implement the necessary changes to get this test to pass
again.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-04-19 17:58:16 +00:00
|
|
|
git cherry-pick refs/heads/unrelated >out &&
|
|
|
|
test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) &&
|
2018-01-05 20:19:59 +00:00
|
|
|
grep -q "^modified$" renamed
|
2016-11-26 12:48:02 +00:00
|
|
|
'
|
|
|
|
|
2007-01-15 06:00:02 +00:00
|
|
|
test_done
|