diff options
| author | Laura Abbott <labbott@redhat.com> | 2018-12-12 22:32:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-07 23:29:34 (GMT) |
| commit | 1eadaa3978fb8f9e9d062379fc95a65fb5ff6f8b (patch) | |
| tree | 31a87b32659c3b405a8f44807209ff80597711ab /git-quiltimport.sh | |
| parent | 5d826e972970a784bd7a7bdf587512510097b8c7 (diff) | |
| download | git-1eadaa3978fb8f9e9d062379fc95a65fb5ff6f8b.zip git-1eadaa3978fb8f9e9d062379fc95a65fb5ff6f8b.tar.gz git-1eadaa3978fb8f9e9d062379fc95a65fb5ff6f8b.tar.bz2 | |
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>
Diffstat (limited to 'git-quiltimport.sh')
| -rwxr-xr-x | git-quiltimport.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-quiltimport.sh b/git-quiltimport.sh index 6d3a88d..e3d3909 100755 --- 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 +keep-non-patch Pass -b to git mailinfo " SUBDIRECTORY_ON=Yes . git-sh-setup @@ -32,6 +33,9 @@ do shift QUILT_SERIES="$1" ;; + --keep-non-patch) + MAILINFO_OPT="-b" + ;; --) shift break;; @@ -98,7 +102,7 @@ do 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?" |