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

[PATCH 1/4] add missing && to submodule-merge testcase

From
Heiko Voigt <hvoigt@hvoigt.net>
Date
Jun 30, 2010, 19:23 UTC
Message-ID
<ed370d28d2e6f8fc3c5adc7042fd2b55b663fd08.1277923844.git.hvoigt@hvoigt.net>
In-Reply-To
<cover.1277923843.git.hvoigt@hvoigt.net>
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
---
 t/t7405-submodule-merge.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index 9a21f78..4a7b893 100755
--- a/t/t7405-submodule-merge.sh
+++ b/t/t7405-submodule-merge.sh
@@ -45,7 +45,7 @@ test_expect_success setup '
 	 git commit -m sub-b) &&
 	git add sub &&
 	test_tick &&
-	git commit -m b
+	git commit -m b &&
 
 	git checkout -b c a &&
 	git merge -s ours b &&
-- 
1.7.1.528.gb3958.dirty
Previous: Heiko VoigtNext: Heiko Voigt
Message 2 of 7 in “implement automatic submodule merge strategy when possible”
  1. 0/4 implement automatic submodule merge strategy when possibleHeiko Voigt, Jun 30, 2010
  2. 1/4 add missing && to submodule-merge testcaseHeiko Voigt, Jun 30, 2010
  3. 2/4 teach ref iteration module about submodulesHeiko Voigt, Jun 30, 2010
  4. Junio C HamanoJun 30, 2010
  5. Heiko VoigtJul 6, 2010
  6. 3/4 extent setup_revisions() so it works with submodulesHeiko Voigt, Jun 30, 2010
  7. 4/4 implement automatic fast forward merge for submodulesHeiko Voigt, Jun 30, 2010

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.