| commit | fa14ee77ac7b0e4d16ede822015cad32f34b6c7f | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Fri, 29 May 2015 11:44:43 +0000 (29 19:44 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 May 2015 16:15:35 +0000 (29 09:15 -0700) | ||
| tree | 7f7bf2cc131b1621f6d4f9d73bd557a7715d6893 | treesnapshot (tar.gz zip) |
| parent | 9570d67c00d6f2994e540aab3abee8f989c350ea | commitdiff |
t5520: test --rebase failure on unborn branch with index
Commit 19a7fcb (allow pull --rebase on branch yet to be born,
2009-08-11) special cases git-pull on an unborn branch in a different
code path such that git-pull --rebase is still valid even though there
is no HEAD yet.
This code path still ensures that there is no index in order not to lose
any staged changes. Implement a test to ensure that this check is
triggered.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commit 19a7fcb (allow pull --rebase on branch yet to be born,
2009-08-11) special cases git-pull on an unborn branch in a different
code path such that git-pull --rebase is still valid even though there
is no HEAD yet.
This code path still ensures that there is no index in order not to lose
any staged changes. Implement a test to ensure that this check is
triggered.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t5520-pull.sh | diffblobblamehistory |