diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:08 -0700 |
commit | db9789ab4ea05c42c08d7c77f87875476eb78d0d (patch) | |
tree | 783b726cbeb42a8b5ba067bfbf59f0a19f3214df | |
parent | 5e1288ac9e20aef893e554ed01906c8151646cac (diff) | |
parent | ff60ffdc05fe8e2d26c488ab18c66b7fa746fcc6 (diff) | |
download | git-db9789ab4ea05c42c08d7c77f87875476eb78d0d.tar.gz git-db9789ab4ea05c42c08d7c77f87875476eb78d0d.tar.xz |
Merge branch 'jh/quiltimport-explicit-series-file'
"quiltimport" allows to specify the series file by honoring the
$QUILT_SERIES environment and also --series command line option.
* jh/quiltimport-explicit-series-file:
git-quiltimport: add commandline option --series <file>
-rw-r--r-- | Documentation/git-quiltimport.txt | 11 | ||||
-rwxr-xr-x | git-quiltimport.sh | 16 |
2 files changed, 23 insertions, 4 deletions
diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt index d64388cb8..ff633b0db 100644 --- 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>] + [--series <file>] DESCRIPTION @@ -42,13 +43,19 @@ OPTIONS 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. +--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 diff --git a/git-quiltimport.sh b/git-quiltimport.sh index 167d79fea..6d3a88dec 100755 --- 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 -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 @@ -27,6 +28,10 @@ do shift QUILT_PATCHES="$1" ;; + --series) + shift + QUILT_SERIES="$1" + ;; --) shift break;; @@ -53,6 +58,13 @@ if ! [ -d "$QUILT_PATCHES" ] ; then 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" @@ -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 -done 3<"$QUILT_PATCHES/series" +done 3<"$QUILT_SERIES" rm -rf $tmp_dir || exit 5 |