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

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

From
Paul Tan <pyokagan@gmail.com>
Date
May 2, 2015, 15:37 UTC
Message-ID
<1430581035-29464-7-git-send-email-pyokagan@gmail.com>
In-Reply-To
<1430581035-29464-1-git-send-email-pyokagan@gmail.com>

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 <pyokagan@gmail.com>
---

I wonder if the .git/index check is still required, as git-read-tree -m will take into account entries in the index as well.

 t/t5520-pull.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 17c63ff..34f3780 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -417,6 +417,17 @@ 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' '
+	git init empty_repo2 &&
+	test_when_finished "rm -rf empty_repo2" &&
+	(
+		cd empty_repo2 &&
+		echo staged-file >staged-file &&
+		git add staged-file &&
+		test_must_fail git pull --rebase .. master
+	)
+'
+
 test_expect_success 'setup for detecting upstreamed changes' '
 	mkdir src &&
 	(cd src &&

-- 
2.1.4
Previous: Paul TanNext: Paul Tan
Message 16 of 21 in “Improve git-pull test coverage”
  1. 0/7 Improve git-pull test coveragePaul Tan, May 2, 2015
  2. 1/7 t5520: test pulling multiple branches into an empty repositoryPaul Tan, May 2, 2015
  3. 2/7 t5520: implement tests for no merge candidates casesPaul Tan, May 2, 2015
  4. Matthieu MoyMay 4, 2015
  5. Paul TanMay 6, 2015
  6. Paul TanMay 6, 2015
  7. 3/7 t5520: test for failure if index has unresolved entriesPaul Tan, May 2, 2015
  8. Matthieu MoyMay 4, 2015
  9. 4/7 t5520: test work tree fast-forward when fetch updates headPaul Tan, May 2, 2015
  10. Eric SunshineMay 3, 2015
  11. Paul TanMay 3, 2015
  12. 5/7 t5520: test --rebase with multiple branchesPaul Tan, May 2, 2015
  13. Stefan BellerMay 4, 2015
  14. Junio C HamanoMay 4, 2015
  15. Paul TanMay 5, 2015
  16. 6/7 t5520: test --rebase failure on unborn branch with indexPaul Tan, May 2, 2015
  17. 7/7 t5521: test --dry-run does not make any changesPaul Tan, May 2, 2015
  18. Matthieu MoyMay 4, 2015
  19. Junio C HamanoMay 4, 2015
  20. Paul TanMay 5, 2015
  21. Paul TanMay 6, 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.