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

[PATCH 1/4] t/lib-submodule-update.sh: clarify test

From
Stefan Beller <sbeller@google.com>
Date
Dec 20, 2017, 22:17 UTC
Message-ID
<20171220221725.129162-2-sbeller@google.com>
In-Reply-To
<20171220221725.129162-1-sbeller@google.com>
Keep the local branch name as the upstream branch name to avoid confusion.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
 t/lib-submodule-update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
index 38dadd2c29..d7699046f6 100755
--- a/t/lib-submodule-update.sh
+++ b/t/lib-submodule-update.sh
@@ -664,8 +664,8 @@ test_submodule_recursing_with_args_common() {
 			cd submodule_update &&
 			git -C sub1 checkout -b keep_branch &&
 			git -C sub1 rev-parse HEAD >expect &&
-			git branch -t check-keep origin/modify_sub1 &&
-			$command check-keep &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
 			test_superproject_content origin/modify_sub1 &&
 			test_submodule_content sub1 origin/modify_sub1 &&
 			git -C sub1 rev-parse keep_branch >actual &&
-- 
2.15.1.620.gb9897f4670-goog
Previous: Stefan BellerNext: Stefan Beller
Message 2 of 7 in “[PATCHv2 0/4] Fix --recurse-submodules for submodule worktree changes”
  1. Stefan BellerDec 20, 2017
  2. 1/4 t/lib-submodule-update.sh: clarify testStefan Beller, Dec 20, 2017
  3. 2/4 t/lib-submodule-update.sh: Fix test ignoring ignored files in submodulesStefan Beller, Dec 20, 2017
  4. 3/4 unpack-trees: Fix same() for submodulesStefan Beller, Dec 20, 2017
  5. Junio C HamanoDec 22, 2017
  6. 4/4 submodule: submodule_move_head omits old argument in forced caseStefan Beller, Dec 20, 2017
  7. Junio C HamanoDec 22, 2017

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.