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

[PATCH] t3407: make reflog check stricter

From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date
Nov 21, 2010, 19:20 UTC
Message-ID
<1290367234-8206-1-git-send-email-martin.von.zweigbergk@gmail.com>
In-Reply-To
<1290337881-26449-1-git-send-email-martin.von.zweigbergk@gmail.com>

--- This is hopefully an improvement to the test case. Please squash with previous patch if you agree.

 t/t3407-rebase-abort.sh |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh
index f3250c3..e573dc8 100755
--- a/t/t3407-rebase-abort.sh
+++ b/t/t3407-rebase-abort.sh
@@ -77,11 +77,12 @@ testrebase() {
 		cd "$work_dir" &&
 		# Clean up the state from the previous one
 		git reset --hard pre-rebase &&
-		reflog_entries_before=$(git reflog show to-rebase | wc -l) &&
+		git reflog show to-rebase > reflog_before &&
 		test_must_fail git rebase$type master &&
 		git rebase --abort &&
-		reflog_entries_after=$(git reflog show to-rebase | wc -l) &&
-		test $reflog_entries_before -eq $reflog_entries_after
+		git reflog show to-rebase > reflog_after &&
+		test_cmp reflog_before reflog_after &&
+		rm reflog_before reflog_after
 	'
 }
 
-- 
1.7.3.2.190.gfb4ae
Previous: Martin von ZweigbergkNext: Junio C Hamano
Message 2 of 4 in “rebase --abort: do not update branch ref”
  1. rebase --abort: do not update branch refMartin von Zweigbergk, Nov 21, 2010
  2. t3407: make reflog check stricterMartin von Zweigbergk, Nov 21, 2010
  3. Junio C HamanoNov 22, 2010
  4. Martin von ZweigbergkNov 22, 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.