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:
c8c80f0
)
dashtopatch: Prevent *.patch+*.Upatch if: <origin>==master
author
Jan Kratochvil
<jan@jankratochvil.net>
Wed, 4 Mar 2020 12:12:31 +0000
(13:12 +0100)
committer
Jan Kratochvil
<jan@jankratochvil.net>
Wed, 4 Mar 2020 12:12:31 +0000
(13:12 +0100)
bin/dashtopatch
patch
|
blob
|
history
diff --git
a/bin/dashtopatch
b/bin/dashtopatch
index
901db5a
..
a70dff1
100755
(executable)
--- a/
bin/dashtopatch
+++ b/
bin/dashtopatch
@@
-33,11
+33,13
@@
for elem in $(echo "$1"|tr '-' ' ');do
if $compile;then
make
fi
if $compile;then
make
fi
- if [ -e "$next".patch ];then
- echo -e '/^--- /,$d\nw'|ed "$next".patch || :
+ if [ "$origin" != "master" ];then
+ if [ -e "$next".patch ];then
+ echo -e '/^--- /,$d\nw'|ed "$next".patch || :
+ fi
+ git diff "$base" "$next" --|diffdecvs >>"$next".patch
+ git diff -U9999999 --binary "$base" "$next" -- >"$next".Upatch
fi
fi
- 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