mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
d38a30df7d
Various commands refuse to run in the presence of conflicts (commit, merge, pull, cherry-pick/revert). They all used to provide rough, and inconsistant error messages. A new variable advice.resolveconflict is introduced, and allows more verbose messages, pointing the user to the appropriate solution. For commit, the error message used to look like this: $ git commit foo.txt: needs merge foo.txt: unmerged (c34a92682e0394bc0d6f4d4a67a8e2d32395c169) foo.txt: unmerged (3afcd75de8de0bb5076942fcb17446be50451030) foo.txt: unmerged (c9785d77b76dfe4fb038bf927ee518f6ae45ede4) error: Error building trees The "need merge" line is given by refresh_cache. We add the IN_PORCELAIN option to make the output more consistant with the other porcelain commands, and catch the error in return, to stop with a clean error message. The next lines were displayed by a call to cache_tree_update(), which is not reached anymore if we noticed the conflict. The new output looks like: U foo.txt fatal: 'commit' is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution and make a commit, or use 'git commit -a'. Pull is slightly modified to abort immediately if $GIT_DIR/MERGE_HEAD exists instead of waiting for merge to complain. The behavior of merge and the test-case are slightly modified to reflect the usual flow: start with conflicts, fix them, and afterwards get rid of MERGE_HEAD, with different error messages at each stage. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
74 lines
1.4 KiB
Bash
Executable File
74 lines
1.4 KiB
Bash
Executable File
#!/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
|
|
'
|
|
|
|
test_expect_success 'cherry-pick after renaming branch' '
|
|
|
|
git checkout rename2 &&
|
|
git cherry-pick added &&
|
|
test $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
|
|
test -f opos &&
|
|
grep "Add extra line at the end" opos
|
|
|
|
'
|
|
|
|
test_expect_success 'revert after renaming branch' '
|
|
|
|
git checkout rename1 &&
|
|
git revert added &&
|
|
test $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
|
|
test -f spoo &&
|
|
! grep "Add extra line at the end" spoo
|
|
|
|
'
|
|
|
|
test_expect_success 'revert forbidden on dirty working tree' '
|
|
|
|
echo content >extra_file &&
|
|
git add extra_file &&
|
|
test_must_fail git revert HEAD 2>errors &&
|
|
grep "Your local changes would be overwritten by " errors
|
|
|
|
'
|
|
|
|
test_done
|