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

[PATCH 4/3] t3700: avoid racy git situation

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Nov 8, 2007, 14:14 UTC
Message-ID
<Pine.LNX.4.64.0711081414160.4362@racer.site>
In-Reply-To
<Pine.LNX.4.64.0711081213580.4362@racer.site>

Wow, the builtin commit is fast. It sometimes triggers a racy situation in the test case for "git add --refresh -- foo".

So when that test fails, simply sleep one second and try again.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t3700-add.sh |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index a328bf5..f4950a3 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -152,7 +152,12 @@ test_expect_success 'git add --refresh' '
 	*) echo fail; (exit 1);;
 	esac &&
 	git add --refresh -- foo &&
-	test -z "`git diff-index HEAD -- foo`"
+	test -z "`git diff-index HEAD -- foo`" || {
+		echo Sleeping one second to avoid racy situation &&
+		sleep 1 &&
+		git add --refresh -- foo &&
+		test -z "`git diff-index HEAD -- foo`"
+	}
 '
 
 test_done
-- 
1.5.3.5.1634.g0fa78
Previous: Johannes SchindelinNext: Johannes Sixt
Message 7 of 13 in “builtin-commit fixes”
  1. 0/3 builtin-commit fixesJohannes Schindelin, Nov 8, 2007
  2. 1/3 builtin-commit: fix reflog message generationJohannes Schindelin, Nov 8, 2007
  3. 2/3 launch_editor(): read the file, even when EDITOR=:Johannes Schindelin, Nov 8, 2007
  4. Johannes SixtNov 8, 2007
  5. 2/3 launch_editor(): read the file, even when EDITOR=:Johannes Schindelin, Nov 8, 2007
  6. 3/3 builtin-commit: fix author date with --amend --author=<author>Johannes Schindelin, Nov 8, 2007
  7. 4/3 t3700: avoid racy git situationJohannes Schindelin, Nov 8, 2007
  8. Johannes SixtNov 8, 2007
  9. Johannes SchindelinNov 8, 2007
  10. Kristian HøgsbergNov 8, 2007
  11. Johannes SixtNov 8, 2007
  12. Junio C HamanoNov 8, 2007
  13. Johannes SchindelinNov 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.