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 2/3] git-p4: small fix for locked-file-move-test
Date: Sat, 4 Apr 2015 09:46:02 +0100 [thread overview]
Message-ID: <1428137163-13219-3-git-send-email-luke@diamand.org> (raw)
In-Reply-To: <1428137163-13219-1-git-send-email-luke@diamand.org>
The test for handling of failure when trying to move a file
that is locked by another client was not quite correct - it
failed early on because the target file in the move already
existed.
The test now fails because git-p4 does not properly detect
that p4 has rejected the move, and instead just crashes. At
present, git-p4 has no support for detecting that a file
has been locked and reporting it to the user, so this is
the expected outcome.
Signed-off-by: Luke Diamand <luke@diamand.org>
---
t/t9816-git-p4-locked.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh
index ce0eb22..464f10b 100755
--- a/t/t9816-git-p4-locked.sh
+++ b/t/t9816-git-p4-locked.sh
@@ -130,8 +130,8 @@ test_expect_failure 'move with lock taken' '
git p4 clone --dest="$git" //depot &&
(
cd "$git" &&
- git mv file1 file2 &&
- git commit -m "mv file1 to file2" &&
+ git mv file1 file3 &&
+ git commit -m "mv file1 to file3" &&
git config git-p4.skipSubmitEdit true &&
git config git-p4.detectRenames true &&
git p4 submit --verbose
--
2.3.4.48.g223ab37
next prev parent reply other threads:[~2015-04-04 8:47 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 ` [PATCH v2 1/3] git-p4: fix small bug in locked test scripts Luke Diamand
2015-04-04 8:46 ` Luke Diamand [this message]
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-3-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).