Re: [PATCH v2 1/2] t5520-pull: Simplify --rebase with dirty tree test

2015-06-11 Thread Paul Tan
On Sun, Jun 7, 2015 at 5:12 AM, Kevin Daudt wrote: > @@ -278,25 +291,6 @@ test_expect_success 'rebased upstream + fetch + pull > --rebase' ' > > ' > > -test_expect_success 'pull --rebase dies early with dirty working directory' ' > - > - git checkout to-rebase && > - git update-ref r

[PATCH v2 1/2] t5520-pull: Simplify --rebase with dirty tree test

2015-06-06 Thread Kevin Daudt
Simplify the test case for testing git aborts the pull --rebase when the work tree is dirty. Signed-off-by: Kevin Daudt Helped-by: Paul Tan --- This is a preparation for the next pathch. Changes since v1: - Moved the tests just belof the first --rebase test - Simplified both tests to only test