git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 6/8] t5520: test --rebase failure on unborn branch with index

From
Paul Tan <pyokagan@gmail.com>
Date
May 18, 2015, 13:32 UTC
Message-ID
<1431955978-17890-7-git-send-email-pyokagan@gmail.com>
In-Reply-To
<1431955978-17890-1-git-send-email-pyokagan@gmail.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>
---
* Removed use of "verbose".
 t/t5520-pull.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index f991439..4d649a5 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -413,6 +413,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>../err &&
+		test "$(git ls-files)" = staged-file &&
+		test "$(git show :staged-file)" = staged-file
+	) &&
+	test_i18ngrep "unborn branch with changes added to the index" err
+'
+
 test_expect_success 'setup for detecting upstreamed changes' '
 	mkdir src &&
 	(cd src &&

-- 
2.1.4
Previous: Paul TanNext: Stefan Beller
Message 17 of 24 in “Improve git-pull test coverage”
  1. 0/8 Improve git-pull test coveragePaul Tan, May 18, 2015
  2. 1/8 t5520: prevent field splitting in content comparisonsPaul Tan, May 18, 2015
  3. Junio C HamanoMay 18, 2015
  4. 2/8 t5520: test no merge candidates casesPaul Tan, May 18, 2015
  5. Johannes SchindelinMay 18, 2015
  6. Junio C HamanoMay 18, 2015
  7. debugging git tests, was: Re: [PATCH v4 2/8] t5520: test no merge candidates casesJeff King, May 18, 2015
  8. Junio C HamanoMay 18, 2015
  9. Johannes SchindelinMay 19, 2015
  10. Jeff KingJun 5, 2015
  11. 3/8 t5520: test for failure if index has unresolved entriesPaul Tan, May 18, 2015
  12. Johannes SchindelinMay 18, 2015
  13. Paul TanMay 21, 2015
  14. 4/8 t5520: test work tree fast-forward when fetch updates headPaul Tan, May 18, 2015
  15. Johannes SchindelinMay 18, 2015
  16. 5/8 t5520: test --rebase with multiple branchesPaul Tan, May 18, 2015
  17. 6/8 t5520: test --rebase failure on unborn branch with indexPaul Tan, May 18, 2015
  18. Stefan BellerMay 18, 2015
  19. Paul TanMay 21, 2015
  20. 7/8 t5521: test --dry-run does not make any changesPaul Tan, May 18, 2015
  21. 8/8 t5520: check reflog action in fast-forward mergePaul Tan, May 18, 2015
  22. Johannes SchindelinMay 18, 2015
  23. Paul TanMay 21, 2015
  24. Junio C HamanoMay 21, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.