From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 May 2009 08:40:22 +0000 (-0700)
Subject: Merge branch 'jm/format-patch-no-auto-n-when-k-is-given'
X-Git-Tag: v1.6.4-rc0~137
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5781e80ffd4cd0c52cdfbf85cac3bb299544a2fc?ds=inline;hp=-c

Merge branch 'jm/format-patch-no-auto-n-when-k-is-given'

* jm/format-patch-no-auto-n-when-k-is-given:
format-patch let -k override a config-specified format.numbered
---

5781e80ffd4cd0c52cdfbf85cac3bb299544a2fc
diff --combined t/t4021-format-patch-numbered.sh
index 3c27f0dc19,9b6e1be8b2..709b3231ca
--- a/t/t4021-format-patch-numbered.sh
+++ b/t/t4021-format-patch-numbered.sh
@@@ -86,6 -86,13 +86,13 @@@ test_expect_success 'format.numbered &
  
  '
  
+ test_expect_success 'format.numbered && --keep-subject' '
+ 
+ 	git format-patch --keep-subject --stdout HEAD^ >patch4a &&
+ 	grep "^Subject: Third" patch4a
+ 
+ '
+ 
  test_expect_success 'format.numbered = auto' '
  
  	git config format.numbered auto
@@@ -108,10 -115,4 +115,10 @@@ test_expect_success 'format.numbered = 
  
  '
  
 +test_expect_success '--start-number && --numbered' '
 +
 +	git format-patch --start-number 3 --numbered --stdout HEAD~1 > patch8 &&
 +	grep "^Subject: \[PATCH 3/3\]" patch8
 +'
 +
  test_done