[PATCH v2 04/12] t6200-fmt-merge-msg: put expected messages into different files

git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed

From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "SZEDER Gábor" <szeder@ira.uka.de>
Subject: [PATCH v2 04/12] t6200-fmt-merge-msg: put expected messages into different files
Date: Wed, 16 Apr 2008 02:39:03 +0200	[thread overview]
Message-ID: <1208306351-20922-5-git-send-email-szeder@ira.uka.de> (raw)
In-Reply-To: <1208306351-20922-4-git-send-email-szeder@ira.uka.de>

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 t/t6200-fmt-merge-msg.sh |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 526d7d1..1af3ab2 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -69,7 +69,7 @@ test_expect_success setup '
 	git show-branch
 '
 
-cat >expected <<\EOF
+cat >msg.left.nolog <<\EOF
 Merge branch 'left'
 EOF
 
@@ -79,10 +79,10 @@ test_expect_success 'merge-msg test #1' '
 	git fetch . left &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	git diff actual expected
+	git diff actual msg.left.nolog
 '
 
-cat >expected <<\EOF
+cat >msg.left_trash <<\EOF
 Merge branch 'left' of ../trash
 EOF
 
@@ -92,10 +92,10 @@ test_expect_success 'merge-msg test #2' '
 	git fetch ../trash left &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	git diff actual expected
+	git diff actual msg.left_trash
 '
 
-cat >expected <<\EOF
+cat >msg.left.log <<\EOF
 Merge branch 'left'
 
 * left:
@@ -115,10 +115,10 @@ test_expect_success 'merge-msg test #3' '
 	git fetch . left &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	git diff actual expected
+	git diff actual msg.left.log
 '
 
-cat >expected <<\EOF
+cat >msg.left_right.log <<\EOF
 Merge branches 'left' and 'right'
 
 * left:
@@ -145,7 +145,7 @@ test_expect_success 'merge-msg test #4' '
 	git fetch . left right &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	git diff actual expected
+	git diff actual msg.left_right.log
 '
 
 test_expect_success 'merge-msg test #5' '
@@ -157,7 +157,7 @@ test_expect_success 'merge-msg test #5' '
 	git fetch . left right &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	git diff actual expected
+	git diff actual msg.left_right.log
 '
 
 test_done
-- 
1.5.5.76.g546c

next prev parent reply	other threads:[~2008-04-16  0:41 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-03  9:03 [PATCH 0/2] merge --summary vs. merge.summary SZEDER Gábor
2008-04-03  9:03 ` [PATCH 1/2] merge, pull: rename '--summary' option to '--diffstat' SZEDER Gábor
2008-04-03  9:03   ` [PATCH 2/2] merge, pull: add option to put summary into the merge commit message SZEDER Gábor
2008-04-03 10:30 ` [PATCH 0/2] merge --summary vs. merge.summary Jeff King
2008-04-03 11:03   ` SZEDER Gábor
2008-04-05 14:48   ` [PATCH] merge, pull: introduce '--diffstat' option SZEDER Gábor
2008-04-05 15:35     ` Teemu Likonen
2008-04-05 18:51       ` Junio C Hamano
2008-04-06  1:23         ` [PATCH 0/6] merge summary and diffstat options cleanup SZEDER Gábor
2008-04-06  1:23           ` [PATCH 1/6] doc: moved merge.* config variables into separate merge-config.txt SZEDER Gábor
2008-04-06  1:23             ` [PATCH 2/6] merge, pull: introduce '--(no-)stat' option SZEDER Gábor
2008-04-06  1:23               ` [PATCH 3/6] add 'merge.stat' config variable SZEDER Gábor
2008-04-06  1:23                 ` [PATCH 4/6] fmt-merge-msg: add '--(no-)log' options and 'merge.log' " SZEDER Gábor
2008-04-06  1:23                   ` [PATCH 5/6] merge, pull: add '--(no-)log' command line option SZEDER Gábor
2008-04-06  1:23                     ` [PATCH 6/6] merge: remove deprecated summary and diffstat options and config variables SZEDER Gábor
2008-04-06  2:36               ` [PATCH 2/6] merge, pull: introduce '--(no-)stat' option Junio C Hamano
2008-04-16  0:38                 ` [PATCH v2 00/12] merge summary and diffstat options cleanup SZEDER Gábor
2008-04-16  0:39                   ` [PATCH v2 01/12] doc: moved merge.* config variables into separate merge-config.txt SZEDER Gábor
2008-04-16  0:39                     ` [PATCH v2 02/12] merge, pull: introduce '--(no-)stat' options SZEDER Gábor
2008-04-16  0:39                       ` [PATCH v2 03/12] add 'merge.stat' config variable SZEDER Gábor
2008-04-16  0:39                         ` SZEDER Gábor [this message]
2008-04-16  0:39                           ` [PATCH v2 05/12] fmt-merge-msg: add '--(no-)log' options and 'merge.log' " SZEDER Gábor
2008-04-16  0:39                             ` [PATCH v2 06/12] merge, pull: add '--(no-)log' command line option SZEDER Gábor
2008-04-16  0:39                               ` [PATCH v2 07/12] merge, pull: mark '--(no-)summary' options as deprecated SZEDER Gábor
2008-04-16  0:39                                 ` [PATCH v2 08/12] merge, pull: mark the config variable 'merge.diffstat' " SZEDER Gábor
2008-04-16  0:39                                   ` [PATCH v2 09/12] fmt-merge-msg: mark summary-related option and config variable " SZEDER Gábor
2008-04-16  0:39                                     ` [PATCH v2 10/12] merge, pull: remove deprecated '--(no-)summary' options SZEDER Gábor
2008-04-16  0:39                                       ` [PATCH v2 11/12] merge, pull: remove deprecated 'merge.diffstat' config variable SZEDER Gábor
2008-04-16  0:39                                         ` [PATCH v2 12/12] fmt-merge-msg: remove deprecated summary-related options and " SZEDER Gábor
2008-04-16  4:23                   ` [PATCH v2 00/12] merge summary and diffstat options cleanup Junio C Hamano
2008-04-06 13:53         ` [PATCH] merge, pull: introduce '--diffstat' option Jeff King
2008-04-06 14:37           ` Jakub Narebski

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:526d7d1 dfblob:1af3ab2
	(help)

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=1208306351-20922-5-git-send-email-szeder@ira.uka.de \
    --to=szeder@ira.uka.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.

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).