Re: [PATCH v4 1/4] commit test: Use test_config instead of git-config

From: Jeremiah Mahler <jmmahler@gmail.com>
Date: Jun 12, 2014, 08:41 UTC
Message-ID: <20140612084152.GA6095@hudson.localdomain>
In-Reply-To: <1402511079-17735-2-git-send-email-caleb@calebthompson.io>

On Wed, Jun 11, 2014 at 01:24:36PM -0500, caleb@calebthompson.io wrote:

Show 34 quoted lines

> Some of the tests in t/t7507-commit-verbose.sh were still using
> git-config to set configuration. Change them to use the test_config
> helper.
> 
> Signed-off-by: Caleb Thompson <caleb@calebthompson.io>
> ---
>  t/t7507-commit-verbose.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
> index 2ddf28c..6d778ed 100755
> --- a/t/t7507-commit-verbose.sh
> +++ b/t/t7507-commit-verbose.sh
> @@ -43,7 +43,7 @@ test_expect_success 'verbose diff is stripped out' '
>  '
> 
>  test_expect_success 'verbose diff is stripped out (mnemonicprefix)' '
> -	git config diff.mnemonicprefix true &&
> +	test_config diff.mnemonicprefix true &&
> 	git commit --amend -v &&
> 	check_message message
>  '
> @@ -71,7 +71,7 @@ test_expect_success 'diff in message is retained with -v' '
>  '
> 
>  test_expect_success 'submodule log is stripped out too with -v' '
> -	git config diff.submodule log &&
> +	test_config diff.submodule log &&
> 	git submodule add ./. sub &&
> 	git commit -m "sub added" &&
> 	(
> --
> 2.0.0
>

It is probably something dumb on my part but for some reason I cannot apply this patch using 'git am'. After I save the patch to a Maildir from Mutt and run git am...

  jeri@hudson:~/git$ ./git-am ct1.patch
  Applying: commit test: Use test_config instead of git-config
  fatal: corrupt patch at line 15
  Patch failed at 0001 commit test: Use test_config instead of git-config
  The copy of the patch that failed is found in:
     /home/jeri/git/.git/rebase-apply/patch
  When you have resolved this problem, run "git am --continue".
  If you prefer to skip this patch, run "git am --skip" instead.
  To restore the original branch and stop patching, run "git am --abort".
  jeri@hudson:~/git$

The second patch in the series applies fine. And I have applied other patches this way without issue. Can anyone confirm this problem?

-- 
Jeremiah Mahler
jmmahler@gmail.com
http://github.com/jmahler