From: Alex Riesen <raa.lkml@gmail.com>
To: git@vger.kernel.org
Cc: "Kristian Høgsberg" <krh@redhat.com>, "Junio C Hamano" <junkio@cox.net>
Subject: [PATCH] stop t1400 hiding errors in tests
Date: Fri, 9 Nov 2007 00:41:39 +0100 [thread overview]
Message-ID: <20071108234139.GD4899@steel.home> (raw)
In-Reply-To: <20071108232751.GC4899@steel.home>
The last rm in the test was lacking an "&&" before it,
which caused the errors in the commands be silently hidden.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Alex Riesen, Fri, Nov 09, 2007 00:27:52 +0100:
> Kristian Høgsberg, Thu, Nov 08, 2007 17:59:00 +0100:
> > This makes git commit a builtin and moves git-commit.sh to
>
> Applied instead of 00c8febf563da on Junio's pu it breaks t1400:
>
> * FAIL 29: git-commit logged updates
> diff expect .git/logs/refs/heads/master
>
>
> Which is not the test actually failed. The failed one is 28, but the
> last "rm -f M" killed the error because of missed "&&" before it.
just separated the fix into a patch of its own. Johannes already took
care of the problem with launch_editor not reading the message file.
t/t1400-update-ref.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index ce045b2..a90824b 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -205,7 +205,7 @@ test_expect_success \
echo $h_TEST >.git/MERGE_HEAD &&
GIT_AUTHOR_DATE="2005-05-26 23:45" \
GIT_COMMITTER_DATE="2005-05-26 23:45" git-commit -F M &&
- h_MERGED=$(git rev-parse --verify HEAD)
+ h_MERGED=$(git rev-parse --verify HEAD) &&
rm -f M'
cat >expect <<EOF
--
1.5.3.5.626.g8f33b
next prev parent reply other threads:[~2007-11-09 3:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-08 16:59 [PATCH] Port git commit to C Kristian Høgsberg
2007-11-08 23:14 ` Junio C Hamano
2007-11-08 23:27 ` Alex Riesen
2007-11-08 23:41 ` Alex Riesen [this message]
2007-11-08 23:47 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071108234139.GD4899@steel.home \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=krh@redhat.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).