From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Oct 2016 20:30:38 +0000 (-0700)
Subject: Merge branch 'kd/mailinfo-quoted-string'
X-Git-Tag: v2.11.0-rc0~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe252ef81a6ff96b3ed11e98feb96784d35f15f8;p=thirdparty%2Fgit.git

Merge branch 'kd/mailinfo-quoted-string'

An author name, that spelled a backslash-quoted double quote in the
human readable part "My \"double quoted\" name", was not unquoted
correctly while applying a patch from a piece of e-mail.

* kd/mailinfo-quoted-string:
  mailinfo: unescape quoted-pair in header fields
  t5100-mailinfo: replace common path prefix with variable
---

fe252ef81a6ff96b3ed11e98feb96784d35f15f8
diff --cc t/t5100-mailinfo.sh
index e173c33f4b,45d228ebc8..e6b995161e
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@@ -7,11 -7,13 +7,13 @@@ test_description='git mailinfo and git 
  
  . ./test-lib.sh
  
+ DATA="$TEST_DIRECTORY/t5100"
+ 
  test_expect_success 'split sample box' \
- 	'git mailsplit -o. "$TEST_DIRECTORY"/t5100/sample.mbox >last &&
+ 	'git mailsplit -o. "$DATA/sample.mbox" >last &&
  	last=$(cat last) &&
  	echo total is $last &&
 -	test $(cat last) = 17'
 +	test $(cat last) = 18'
  
  check_mailinfo () {
  	mail=$1 opt=$2