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

[PATCH 3/3] t7400: barf if git-submodule removes or replaces a file

From
LHLars Hjemli <hjemli@gmail.com>
Date
Jun 9, 2007, 21:38 UTC
Message-ID
<11814251333211-git-send-email-hjemli@gmail.com>
In-Reply-To
<1181425132239-git-send-email-hjemli@gmail.com>

The test for an unmolested file wouldn't fail properly if the file had been removed or replaced by something other than a regular file. This fixes it.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
 t/t7400-submodule-basic.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 3940433..74fafce 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -72,7 +72,7 @@ test_expect_success 'update should fail when path is used by a file' '
 	then
 		echo "[OOPS] update should have failed"
 		false
-	elif test -f lib && test "$(cat lib)" != "hello"
+	elif test "$(cat lib)" != "hello"
 	then
 		echo "[OOPS] update failed but lib file was molested"
 		false
-- 
1.5.2.1.914.gbd3a7
Previous: Lars Hjemli
Message 29 of 29 in “submodule improvements”
  1. 0/3 submodule improvementsLars Hjemli, Jun 9, 2007
  2. 1/3 git-submodule: allow submodule name and path to differLars Hjemli, Jun 9, 2007
  3. Junio C HamanoJun 10, 2007
  4. Johannes SchindelinJun 10, 2007
  5. Junio C HamanoJun 10, 2007
  6. Lars HjemliJun 10, 2007
  7. Lars HjemliJun 10, 2007
  8. 2/3 Add gitmodules(5)Lars Hjemli, Jun 9, 2007
  9. Frank LichtenheldJun 10, 2007
  10. Lars HjemliJun 10, 2007
  11. Johannes SchindelinJun 10, 2007
  12. Lars HjemliJun 10, 2007
  13. Sven VerdoolaegeJun 10, 2007
  14. Lars HjemliJun 10, 2007
  15. Sven VerdoolaegeJun 10, 2007
  16. Lars HjemliJun 10, 2007
  17. Junio C HamanoJun 10, 2007
  18. Lars HjemliJun 10, 2007
  19. Sven VerdoolaegeJun 11, 2007
  20. Lars HjemliJun 11, 2007
  21. Sven VerdoolaegeJun 11, 2007
  22. Junio C HamanoJun 11, 2007
  23. Matthias LederhoferJun 13, 2007
  24. Lars HjemliJun 13, 2007
  25. Matthias LederhoferJun 13, 2007
  26. Lars HjemliJun 13, 2007
  27. Junio C HamanoJun 13, 2007
  28. gitmodules(5): remove leading period from synopsisLars Hjemli, Jun 13, 2007
  29. 3/3 t7400: barf if git-submodule removes or replaces a fileLars Hjemli, Jun 9, 2007

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.