Re: [PATCH v4 4/8] t5520: test work tree fast-forward when fetch updates head
flat view
From: Johannes Schindelin <hidden>
Date: 2016-06-15 23:04:48
Hi Paul, On 2015-05-18 15:32, Paul Tan wrote:
quoted hunk ↗ jump to hunk
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 3bc0594..3a53a5e 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh@@ -184,6 +184,27 @@ test_expect_success 'fail if the index hasunresolved entries' ' test_cmp expected file ' +test_expect_success 'fast-forwards working tree if branch head is updated' ' + git checkout -b third second^ && + test_when_finished "git checkout -f copy && git branch -D third" &&
If you follow my argument in 2/8, this line, and...
[...] +test_expect_success 'fast-forward fails with conflicting work tree' ' + git checkout -b third second^ && + test_when_finished "git checkout -f copy && git branch -D third" &&
... this line should be dropped, too. This comment concludes my review of v4 of this patch series. Well done! Ciao, Dscho