[PATCH v2 05/12] t5520: test --rebase failure on unborn branch with index
flat view
STALE3764d
From: Paul Tan <hidden>
Date: 2016-06-15 23:04:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 5 in this series.
Revisions (5)
Commit 19a7fcbf (allow pull --rebase on branch yet to be born) 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 <redacted>
---
Notes:
* Test for error message.
* Ensure that when git-pull does not modify the index.
* Moved test_when_finished
t/t5520-pull.sh | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 05a92a2..9107991 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh@@ -415,6 +415,21 @@ test_expect_success 'pull --rebase works on branch yet to be born' ' test_cmp expect actual ' +test_expect_success 'pull --rebase fails on unborn branch with staged changes' ' + test_when_finished "rm -rf empty_repo2" && + git init empty_repo2 && + ( + cd empty_repo2 && + echo staged-file >staged-file && + git add staged-file && + test "$(git ls-files)" = staged-file && + test_must_fail git pull --rebase .. master 2>../out && + test "$(git ls-files)" = staged-file && + test "$(git show :staged-file)" = staged-file + ) && + test_i18ngrep "unborn branch with changes added to the index" out +' + test_expect_success 'setup for detecting upstreamed changes' ' mkdir src && (cd src &&
--
2.1.4