From 5e237d2960760310b80ba965d7f2ca879db3d1e0 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 27 Jan 2020 09:06:50 +0100 Subject: [PATCH] dashtopath: -'-' requirement dashtopath: +*.Upatch --- bin/dashtopatch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/dashtopatch b/bin/dashtopatch index 717c5cc..c1776e7 100755 --- a/bin/dashtopatch +++ b/bin/dashtopatch @@ -5,7 +5,7 @@ if [ "$1" = -c ];then compile=true shift fi -if [ $# != 1 ] || ! echo "$1" | grep -q '-';then +if [ $# != 1 ];then echo >&2 "Syntax: $0 branch-list-delimited-by-dashes" exit 1 fi @@ -36,7 +36,8 @@ for elem in $(echo "$1"|tr '-' ' ');do if [ -e "$next".patch ];then echo -e '/^--- /,$d\nw'|ed "$next".patch || : fi - git diff "$base" "$next"|diffdecvs >>"$next".patch + git diff "$base" "$next" --|diffdecvs >>"$next".patch + git diff -U9999999 --binary "$base" "$next" -- >"$next".Upatch if $gerrit;then cp "$next".patch dashtopatch.patch echo -e '/^--- /,$d\nw'|ed dashtopatch.patch -- 1.8.3.1