From: Nazri Ramliy <ayiehere@gmail.com>
To: git@vger.kernel.org, gitster@pobox.com, johannes.schindelin@gmx.de
Cc: Nazri Ramliy <ayiehere@gmail.com>
Subject: [PATCH 1/2] lib-rebase.sh: fake-editor.sh: Allow checking of commit header(s) in $GIT_EDITOR
Date: Mon, 12 Jul 2010 09:04:22 +0800 [thread overview]
Message-ID: <1278896663-3922-1-git-send-email-ayiehere@gmail.com> (raw)
Signed-off-by: Nazri Ramliy <ayiehere@gmail.com>
---
t/lib-rebase.sh | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 6aefe27..5804d23 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -4,6 +4,8 @@
#
# - override the commit message with $FAKE_COMMIT_MESSAGE
# - amend the commit message with $FAKE_COMMIT_AMEND
+# - check that commit header(s) in the editor matches that in the
+# file $EXPECT_HEADER.
# - check that non-commit messages have a certain line count with $EXPECT_COUNT
# - check the commit count in the commit message header with $EXPECT_HEADER_COUNT
# - rewrite a rebase -i script as directed by $FAKE_LINES.
@@ -34,6 +36,12 @@ case "$1" in
exit
;;
esac
+test -z "$EXPECT_HEADER" ||
+ (
+ grep '^pick' < "$1" | cut -d' ' -f3- > commit_headers.$$ &&
+ diff "$EXPECT_HEADER" commit_headers.$$ > /dev/null
+ ) ||
+ exit
test -z "$EXPECT_COUNT" ||
test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" | wc -l) ||
exit
--
1.7.2.rc2
next reply other threads:[~2010-07-12 1:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-12 1:04 Nazri Ramliy [this message]
2010-07-12 1:04 ` [PATCH 2/2] rebase -i: Preserve whitespace at beginning of commit header in $GIT_EDITOR Nazri Ramliy
-- strict thread matches above, loose matches on Subject: below --
2010-07-10 12:27 [PATCH 1/2] lib-rebase.sh: fake-editor.sh: Allow checking of commit header(s) " Nazri Ramliy
2010-07-12 6:08 ` Junio C Hamano
2010-07-13 0:36 ` Nazri Ramliy
2010-07-13 1:39 ` Jay Soffian
2010-07-13 1:58 ` Nazri Ramliy
2010-07-13 5:13 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1278896663-3922-1-git-send-email-ayiehere@gmail.com \
--to=ayiehere@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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).