From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Pete Wyckoff <pw@padd.com>, Junio C Hamano <gitster@pobox.com>,
Blair Holloway <Blair_Holloway@playstation.sony.com>,
Luke Diamand <luke@diamand.org>
Subject: [PATCH v2 1/3] git-p4: fix small bug in locked test scripts
Date: Sat, 4 Apr 2015 09:46:01 +0100 [thread overview]
Message-ID: <1428137163-13219-2-git-send-email-luke@diamand.org> (raw)
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
next prev parent reply other threads:[~2015-04-04 8:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-04 8:46 [PATCH v2 0/3] git-p4: updated locked file handling patch series Luke Diamand
2015-04-04 8:46 ` Luke Diamand [this message]
2015-04-04 8:46 ` [PATCH v2 2/3] git-p4: small fix for locked-file-move-test Luke Diamand
2015-04-04 8:46 ` [PATCH v2 3/3] git-p4: fix filetype detection on files opened exclusively Luke Diamand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428137163-13219-2-git-send-email-luke@diamand.org \
--to=luke@diamand.org \
--cc=Blair_Holloway@playstation.sony.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pw@padd.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).