git://git.jankratochvil.net
/
nethome.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8234c12
)
dashtopath: -'-' requirement
author
Jan Kratochvil
<jan.kratochvil@redhat.com>
Mon, 27 Jan 2020 08:06:50 +0000
(09:06 +0100)
committer
Jan Kratochvil
<jan.kratochvil@redhat.com>
Mon, 27 Jan 2020 08:06:50 +0000
(09:06 +0100)
dashtopath: +*.Upatch
bin/dashtopatch
patch
|
blob
|
history
diff --git
a/bin/dashtopatch
b/bin/dashtopatch
index
717c5cc
..
c1776e7
100755
(executable)
--- a/
bin/dashtopatch
+++ b/
bin/dashtopatch
@@
-5,7
+5,7
@@
if [ "$1" = -c ];then
compile=true
shift
fi
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
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
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
if $gerrit;then
cp "$next".patch dashtopatch.patch
echo -e '/^--- /,$d\nw'|ed dashtopatch.patch