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

[PATCH v2 1/3] git-p4: fix small bug in locked test scripts

From
Luke Diamand <luke@diamand.org>
Date
Apr 4, 2015, 08:46 UTC
Message-ID
<1428137163-13219-2-git-send-email-luke@diamand.org>
In-Reply-To
<1428137163-13219-1-git-send-email-luke@diamand.org>

Test script t9816-git-p4-locked.sh test #4 tests for adding a file that is locked by Perforce automatically. This is currently not supported by git-p4 and so is expected to fail.

However, a small typo meant it always failed, even with a fixed git-p4. Fix the typo to resolve this.

Signed-off-by: Luke Diamand <luke@diamand.org>
---
 t/t9816-git-p4-locked.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh
index e71e543..ce0eb22 100755
--- a/t/t9816-git-p4-locked.sh
+++ b/t/t9816-git-p4-locked.sh
@@ -41,7 +41,7 @@ test_expect_failure 'add with lock not taken' '
 	(
 		cd "$git" &&
 		echo line1 >>add-lock-not-taken &&
-		git add file2 &&
+		git add add-lock-not-taken &&
 		git commit -m "add add-lock-not-taken" &&
 		git config git-p4.skipSubmitEdit true &&
 		git p4 submit --verbose
-- 
2.3.4.48.g223ab37
Previous: Luke DiamandNext: Luke Diamand
Message 2 of 4 in “git-p4: updated locked file handling patch series”
  1. 0/3 git-p4: updated locked file handling patch seriesLuke Diamand, Apr 4, 2015
  2. 1/3 git-p4: fix small bug in locked test scriptsLuke Diamand, Apr 4, 2015
  3. 2/3 git-p4: small fix for locked-file-move-testLuke Diamand, Apr 4, 2015
  4. 3/3 git-p4: fix filetype detection on files opened exclusivelyLuke Diamand, Apr 4, 2015

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.