Re: [PATCH 0/5] Builtin "git remote"

From

Johannes Schindelin <johannes.schindelin@gmx.de>

Date

Mar 2, 2008, 15:15 UTC

Message-ID

<alpine.LSU.1.00.0803021511420.22527@racer.site>

In-Reply-To

<alpine.LSU.1.00.0802291118540.22527@racer.site>

[PATCH] format-patch: use the diff options for the cover letter, too

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

	On Fri, 29 Feb 2008, Johannes Schindelin wrote:

	> On Thu, 28 Feb 2008, Daniel Barkalow wrote:
	> 
	> > On Thu, 28 Feb 2008, Junio C Hamano wrote:
	> > 
	> > > Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
	> > > 
	> > > > It also demonstrates that format-patch --cover-letter 
	> > > > should default to -M for the diffstat (search for 
	> > > > "git-remote.perl"...).
	> > > 
	> > > It probably should inherit the settings for the primary 
	> > > part. You did generate the series with -M, especially [PATCH 
	> > > 4/5], didn't you?
	> > 
	> > Obviously not the output_format, but everything else, I 
	> > assume? Easy enough to pass the main diff options into 
	> > make_cover_letter() and use them to initialize the diff 
	> > options there.

	Voila.

	I thought that the changes in the for loops do not merit an own
	patch, but if you think otherwise, let me know, and I'll resend.

 builtin-log.c           |    2 +-
 t/t4014-format-patch.sh |   18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/builtin-log.c b/builtin-log.c
index bbadbc0..17e491b 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -694,7 +694,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 	if (!origin)
 		return;
 
-	diff_setup(&opts);
+	memcpy(&opts, &rev->diffopt, sizeof(opts));
 	opts.output_format |= DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
 
 	diff_setup_done(&opts);
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 16aa99d..6d86b7d 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -147,7 +147,7 @@ test_expect_success 'thread' '
 	for i in patches/0002-* patches/0003-*
 	do
 	  grep "References: $FIRST_MID" $i &&
-	  grep "In-Reply-To: $FIRST_MID" $i
+	  grep "In-Reply-To: $FIRST_MID" $i || break
 	done
 '
 
@@ -160,7 +160,7 @@ test_expect_success 'thread in-reply-to' '
 	for i in patches/*
 	do
 	  grep "References: $FIRST_MID" $i &&
-	  grep "In-Reply-To: $FIRST_MID" $i
+	  grep "In-Reply-To: $FIRST_MID" $i || break
 	done
 '
 
@@ -173,7 +173,7 @@ test_expect_success 'thread cover-letter' '
 	for i in patches/0001-* patches/0002-* patches/0003-* 
 	do
 	  grep "References: $FIRST_MID" $i &&
-	  grep "In-Reply-To: $FIRST_MID" $i
+	  grep "In-Reply-To: $FIRST_MID" $i || break
 	done
 '
 
@@ -186,7 +186,7 @@ test_expect_success 'thread cover-letter in-reply-to' '
 	for i in patches/*
 	do
 	  grep "References: $FIRST_MID" $i &&
-	  grep "In-Reply-To: $FIRST_MID" $i
+	  grep "In-Reply-To: $FIRST_MID" $i || break
 	done
 '
 
@@ -201,4 +201,14 @@ test_expect_success 'excessive subject' '
 	ls patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
 '
 
+test_expect_success 'cover-letter inherits diff options' '
+
+	git mv file foo &&
+	git commit -m foo &&
+	git format-patch --cover-letter -1 &&
+	! grep "file => foo .* 0 *$" 0000-cover-letter.patch &&
+	git format-patch --cover-letter -1 -M &&
+	grep "file => foo .* 0 *$" 0000-cover-letter.patch
+
+'
 test_done

-- 
1.5.4.3.510.g7cdd