Re: [PATCH v3 4/9] t5520: test for failure if index has unresolved entries
flat view
From: Paul Tan <hidden>
Date: 2016-06-15 23:04:47
On Wed, May 13, 2015 at 5:08 PM, Paul Tan [off-list ref] wrote:
quoted hunk ↗ jump to hunk
+test_expect_success 'fail if the index has unresolved entries' ' + git checkout -b third second^ && + test_when_finished "git checkout -f copy && git branch -D third" && + verbose test "$(cat file)" = file && + echo modified2 >file && + git commit -a -m modified2 && + verbose test -z "$(git ls-files -u)" && + test_must_fail git pull . second && + verbose test -n "$(git ls-files -u)" && + cp file expected && + test_must_fail git pull . second 2>err && + test_i18ngrep "you have unmerged files" err &&
Hmm, it appears that this is too loose, as git-merge will throw "merge is not possible because you have unmerged files". So it looks like we will have to go back to the stricter "Pull is not possible because you have unmerged files".
+ test_cmp expected file &&
+ git add file &&
+ verbose test -z "$(git ls-files -u)" &&
+ test_must_fail git pull . second 2>err &&
+ test_i18ngrep "have not concluded your merge" err &&
+ test_cmp expected file
+'
+
test_expect_success '--rebase' '
git branch to-rebase &&
echo modified again > file &&
--
2.1.4