From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH] Adjust t3404 to ignore empty lines in the todo file
Date: Thu, 22 Nov 2007 11:41:27 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.64.0711221139490.27959@racer.site> (raw)
In-Reply-To: <Pine.LNX.4.64.0711221113360.27959@racer.site>
---
... and this fixes the tests again. I changed the single "#"
line after the commits to an empty line, since it made things
more readable to this developer. The test expected "#", though.
Please amend.
t/t3404-rebase-interactive.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index f1039d1..907c7f9 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -149,7 +149,8 @@ test_expect_success 'stop on conflicting pick' '
diff -u expect .git/.dotest-merge/patch &&
diff -u expect2 file1 &&
test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) &&
- test 0 = $(grep -v "^#" < .git/.dotest-merge/git-rebase-todo | wc -l)
+ test 0 = $(grep -ve "^#" -e "^$" < .git/.dotest-merge/git-rebase-todo |
+ wc -l)
'
test_expect_success 'abort' '
--
1.5.3.6.1977.g54d30
next prev parent reply other threads:[~2007-11-22 11:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-22 9:21 Reordering lines in "git-rebase -i" task sheet Junio C Hamano
2007-11-22 11:15 ` [PATCH] rebase -i: move help to end of todo file Johannes Schindelin
2007-11-22 11:41 ` Johannes Schindelin [this message]
2007-11-22 11:46 ` Junio C Hamano
2007-11-22 12:30 ` Johannes Schindelin
2007-11-22 12:31 ` Jeff King
2007-11-22 11:18 ` [PATCH] rebase -i: give rerere a chance Johannes Schindelin
2007-11-29 0:17 ` Junio C Hamano
2007-11-29 0:22 ` Johannes Schindelin
2007-11-29 9:59 ` David Kastrup
2007-11-22 19:25 ` Reordering lines in "git-rebase -i" task sheet David Brown
2007-11-22 22:11 ` Johannes Schindelin
2007-11-23 8:54 ` Andy Parkins
2007-11-26 13:14 ` Andy Parkins
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=Pine.LNX.4.64.0711221139490.27959@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).