summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-06-14 11:59:58 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-06-14 18:13:38 +0200
commita14c29d8f1de49f178f56b073e755af8168ec25b (patch)
treed0b640f66d6ec1ee12533292dcb5afd777d5241e
parentf81657980e13b8889d424ce1670283b8648ef6e5 (diff)
downloadptxdist-a14c29d8f1de49f178f56b073e755af8168ec25b.tar.gz
ptxdist-a14c29d8f1de49f178f56b073e755af8168ec25b.tar.xz
git-ptx-patches: use --no-signature only when supported
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rwxr-xr-xscripts/git-ptx-patches6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches
index 86370550b..c5eb405f4 100755
--- a/scripts/git-ptx-patches
+++ b/scripts/git-ptx-patches
@@ -59,8 +59,12 @@ case "$remove_old" in
;;
esac
+if git format-patch -h 2>&1 | grep -q signature; then
+ GIT_EXTRA_ARGS="--no-signature"
+fi
+
echo "$PTX_PATCHES_HEADER" > .ptxdist/series
-git format-patch -N --no-signature -o .ptxdist/patches/ base | sed -e 's,^.ptxdist/patches/,,' >> .ptxdist/series
+git format-patch -N $GIT_EXTRA_ARGS -o .ptxdist/patches/ base | sed -e 's,^.ptxdist/patches/,,' >> .ptxdist/series
cat .ptxdist/series | _md5sum >> .ptxdist/series
# The first line of the patch is 'From <some-git-hash> ...'