git-quiltimport: add commandline option --series <file>

The quilt series file doesn't have to be located in the same directory
with the patches and can be named differently than 'series' as well. This
patch adds a commandline option to allow for a non-standard series
filename and location.

Signed-off-by: Juerg Haefliger <juerg.haefliger@hp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt
index d64388cb8e454be17e4c20caf95897a71619c11f..ff633b0db7d54d8db12c4af248fc2bd3939b6f9c 100644 (file)
--- a/Documentation/git-quiltimport.txt
+++ b/Documentation/git-quiltimport.txt
@@ -10,6 +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>]

 
 
 DESCRIPTION
 
 
 DESCRIPTION


@@ -42,13 +43,19 @@ OPTIONS
        information can be found in the patch description.
 
 --patches <dir>::
        information can be found in the patch description.
 
 --patches <dir>::

-       The directory to find the quilt patches and the
-       quilt series file.
+       The directory to find the quilt patches.

 +
 The default for the patch directory is patches
 or the value of the $QUILT_PATCHES environment
 variable.
 
 +
 The default for the patch directory is patches
 or the value of the $QUILT_PATCHES environment
 variable.
 

+--series <file>::
+       The quilt series file.
++
+The default for the series file is <patches>/series
+or the value of the $QUILT_SERIES environment
+variable.
+

 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 167d79fea809b918e81c2228ee27baa5fab23db4..6d3a88decdeee3f85d9ee43ef8e716ccd1a6328b 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -6,7 +6,8 @@ git quiltimport [options]
 --
 n,dry-run     dry run
 author=       author name and email address for patches without any
 --
 n,dry-run     dry run
 author=       author name and email address for patches without any

-patches=      path to the quilt series and patches
+patches=      path to the quilt patches
+series=       path to the quilt series file

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


@@ -27,6 +28,10 @@ do
                shift
                QUILT_PATCHES="$1"
                ;;
                shift
                QUILT_PATCHES="$1"
                ;;

+       --series)
+               shift
+               QUILT_SERIES="$1"
+               ;;

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


@@ -53,6 +58,13 @@ if ! [ -d "$QUILT_PATCHES" ] ; then
        exit 1
 fi
 
        exit 1
 fi
 

+# Quilt series file
+: ${QUILT_SERIES:=$QUILT_PATCHES/series}
+if ! [ -e "$QUILT_SERIES" ] ; then
+       echo "The \"$QUILT_SERIES\" file does not exist."
+       exit 1
+fi
+

 # Temporary directories
 tmp_dir="$GIT_DIR"/rebase-apply
 tmp_msg="$tmp_dir/msg"
 # Temporary directories
 tmp_dir="$GIT_DIR"/rebase-apply
 tmp_msg="$tmp_dir/msg"


@@ -135,5 +147,5 @@ do
                commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) &&
                git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4
        fi
                commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) &&
                git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4
        fi

-done 3<"$QUILT_PATCHES/series"
+done 3<"$QUILT_SERIES"

 rm -rf $tmp_dir || exit 5
 rm -rf $tmp_dir || exit 5