git://git.jankratochvil.net
/
nethome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Use $HOME/ path for errs12.
[nethome.git]
/
bin
/
dashtopatch
diff --git
a/bin/dashtopatch
b/bin/dashtopatch
index
3661ccf
..
73952a0
100755
(executable)
--- a/
bin/dashtopatch
+++ b/
bin/dashtopatch
@@
-1,22
+1,46
@@
#! /bin/sh
set -ex
#! /bin/sh
set -ex
+compile=false
+if [ "$1" = -c ];then
+ compile=true
+ shift
+fi
if [ $# != 1 ] || ! echo "$1" | grep -q '-';then
echo >&2 "Syntax: $0 branch-list-delimited-by-dashes"
exit 1
fi
if [ $# != 1 ] || ! echo "$1" | grep -q '-';then
echo >&2 "Syntax: $0 branch-list-delimited-by-dashes"
exit 1
fi
-base="master"
+base="gdb/master"
+gerrit=true
+if git branch -D gerrit;then
+ git checkout gdb/master
+ git checkout -b gerrit
+else
+ gerrit=false
+fi
for elem in $(echo "$1"|tr '-' ' ');do
for elem in $(echo "$1"|tr '-' ' ');do
- if [ "$base" = "master" ];then
+ if [ "$base" = "
gdb/
master" ];then
next="$elem"
else
next="$base-$elem"
fi
git checkout "$next"
next="$elem"
else
next="$base-$elem"
fi
git checkout "$next"
- git merge "$base"
+ git merge --no-edit "$base"
+ if $compile;then
+ make
+ fi
if [ -e "$next".patch ];then
if [ -e "$next".patch ];then
- echo -e '/^--- /,$d\nw'|ed "$next".patch
+ echo -e '/^--- /,$d\nw'|ed "$next".patch
|| :
fi
git diff "$base" "$next"|diffdecvs >>"$next".patch
fi
git diff "$base" "$next"|diffdecvs >>"$next".patch
+ if $gerrit;then
+ cp "$next".patch dashtopatch.patch
+ echo -e '/^--- /,$d\nw'|ed dashtopatch.patch
+ git checkout gerrit
+ patch -p1 <"$next".patch
+ git commit -a -F dashtopatch.patch
+ rm -f dashtopatch.patch
+ fi
base="$next"
done
base="$next"
done
+git checkout "$next"
echo OK
echo OK