git-quiltimport: add --keep-non-patch option

git-am has the --keep-non-patch option to pass -b to
git-mailinfo for keeping subject prefixes intact. Allow
this option to be used with quiltimport as well.

Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt
index 8cf952b4de669ea3e7275c5d10087005548574eb..70562dc4c0235d53501bab56ff98af6169b8f968 100644 (file)
--- a/Documentation/git-quiltimport.txt
+++ b/Documentation/git-quiltimport.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]
 --------
 [verse]
 'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]

-               [--series <file>]
+               [--series <file>] [--keep-non-patch]

 
 
 DESCRIPTION
 
 
 DESCRIPTION


@@ -56,6 +56,9 @@ The default for the series file is <patches>/series
 or the value of the `$QUILT_SERIES` environment
 variable.
 
 or the value of the `$QUILT_SERIES` environment
 variable.
 

+--keep-non-patch::
+       Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
+

 GIT
 ---
 Part of the linkgit:git[1] suite
 GIT
 ---
 Part of the linkgit:git[1] suite

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 6d3a88decdeee3f85d9ee43ef8e716ccd1a6328b..e3d390974331e83261ba32e757724723b9bea724 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -8,6 +8,7 @@ n,dry-run     dry run
 author=       author name and email address for patches without any
 patches=      path to the quilt patches
 series=       path to the quilt series file
 author=       author name and email address for patches without any
 patches=      path to the quilt patches
 series=       path to the quilt series file

+keep-non-patch Pass -b to git mailinfo

 "
 SUBDIRECTORY_ON=Yes
 . git-sh-setup
 "
 SUBDIRECTORY_ON=Yes
 . git-sh-setup


@@ -32,6 +33,9 @@ do
                shift
                QUILT_SERIES="$1"
                ;;
                shift
                QUILT_SERIES="$1"
                ;;

+       --keep-non-patch)
+               MAILINFO_OPT="-b"
+               ;;

        --)
                shift
                break;;
        --)
                shift
                break;;


@@ -98,7 +102,7 @@ do
                continue
        fi
        echo $patch_name
                continue
        fi
        echo $patch_name

-       git mailinfo "$tmp_msg" "$tmp_patch" \
+       git mailinfo $MAILINFO_OPT "$tmp_msg" "$tmp_patch" \

                <"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3
        test -s "$tmp_patch" || {
                echo "Patch is empty.  Was it split wrong?"
                <"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3
        test -s "$tmp_patch" || {
                echo "Patch is empty.  Was it split wrong?"