[PATCHv2 2/4] git-am foreign patch support: autodetect some patch formats
- From
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
- Date
- May 26, 2009, 00:38 UTC
- Message-ID
- <1243298290-5909-3-git-send-email-giuseppe.bilotta@gmail.com>
- In-Reply-To
- <1243298290-5909-2-git-send-email-giuseppe.bilotta@gmail.com>
Default to mbox format if input is from stdin. Otherwise, look at the first few lines of the first patch to try to guess its format.
Include checks for mailboxes, stgit patch series, stgit single patches and hg patches. --- git-am.sh | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/git-am.sh b/git-am.sh index da160de..4cf66aa 100755 --- a/git-am.sh +++ b/git-am.sh @@ -142,7 +142,57 @@ check_patch_format () { then return 0 fi - patch_format=mbox + + # we default to mbox format if input is from stdin and for + # directories + if test $# = 0 || test "x$1" = "x-" || test -d "$1" + then + patch_format=mbox + return 0 + fi + + # otherwise, check the first few lines of the first patch to try + # to detect its format + { + read l1 + read l2 + read l3 + case "$l1" in + From\ *) + patch_format=mbox + ;; + From:\ *) + patch_format=mbox + ;; + '# This series applies on GIT commit'*) + patch_format=stgit-series + ;; + "# HG changeset patch") + patch_format=hg + ;; + *) + # if the second line is empty and the third is + # a From, Author or Date entry, this is very + # likely an StGIT patch + if test "x$l2" = x + then + case "$l3" in + From:\ *) + patch_format=stgit + ;; + Author:\ *) + patch_format=stgit + ;; + Date:\ *) + patch_format=stgit + ;; + *) + ;; + esac + fi + ;; + esac + } < "$1" } split_patches () {
-- 1.6.3.1.248.gb44be