From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 29 Jan 2012 21:18:53 +0000 (-0800)
Subject: Merge branch 'tr/maint-mailinfo'
X-Git-Tag: v1.7.10-rc0~143
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bff64a9cdabee8476ad1d2e45f586a2d6a884363;p=git.git

Merge branch 'tr/maint-mailinfo'

* tr/maint-mailinfo:
  mailinfo: with -b, keep space after [foo]
  am: learn passing -b to mailinfo

Conflicts:
	git-am.sh
---

bff64a9cdabee8476ad1d2e45f586a2d6a884363
diff --cc git-am.sh
index 1c13b1399,8b755d93b..64d8e2a64
--- a/git-am.sh
+++ b/git-am.sh
@@@ -571,10 -535,21 +578,15 @@@ the
  else
  	utf8=-n
  fi
- if test "$(cat "$dotest/keep")" = t
- then
- 	keep=-k
- fi
+ keep=$(cat "$dotest/keep")
+ case "$keep" in
+ t)
+ 	keep=-k ;;
+ b)
+ 	keep=-b ;;
+ *)
+ 	keep= ;;
+ esac
 -case "$(cat "$dotest/keepcr")" in
 -t)
 -	keepcr=--keep-cr ;;
 -f)
 -	keepcr=--no-keep-cr ;;
 -esac
  case "$(cat "$dotest/scissors")" in
  t)
  	scissors=--scissors ;;