Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx> writes:
> It would be nice if git-quiltimport would just warn about
> non-existent patches, just like quilt. This will make it work
> with `markers' we put in our quilt series files. Commenting
> out the markers is no solution as `quilt series' doesn't show
> commented-out patches.
I cannot decide if this should be the default (that's up to
heavy users of git-quiltimport script), but something along this
line should do. Care to test it and ack?
---
git-quiltimport.sh | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 74a54d5..3c38959 100755
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -4,6 +4,7 @@ SUBDIRECTORY_ON=Yes
. git-sh-setup
dry_run=""
+error_empty=t
quilt_author=""
while test $# != 0
do
@@ -25,6 +26,11 @@ do
dry_run=1
;;
+ --expect-marker)
+ shift
+ error_empty=
+ ;;
+
--pa=*|--pat=*|--patc=*|--patch=*|--patche=*|--patches=*)
QUILT_PATCHES=$(expr "z$1" : 'z-[^=]*\(.*\)')
shift
@@ -74,10 +80,17 @@ for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do
echo $patch_name
git mailinfo "$tmp_msg" "$tmp_patch" \
<"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3
- test -s "$tmp_patch" || {
- echo "Patch is empty. Was it split wrong?"
- exit 1
- }
+ if test ! -s "$tmp_patch"
+ then
+ if test -z "$error_empty"
+ then
+ echo "Patch is empty. Was it split wrong?"
+ exit 1
+ else
+ echo "Marker seen."
+ continue
+ fi
+ fi
# Parse the author information
export GIT_AUTHOR_NAME=$(sed -ne 's/Author: //p' "$tmp_info")
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
