X-Git-Url: http://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fdashtopatch;h=a70dff1e5753b5b060b8f846817ca59c39e86348;hp=c48fad673de0d7cca62202f51d3da39298c546b0;hb=f51a7283ffe021d8f9b3bfb14a9cedb37a7d15ca;hpb=17d22308f54d26acd815fb0887110ad83f0d7437

diff --git a/bin/dashtopatch b/bin/dashtopatch
index c48fad6..a70dff1 100755
--- a/bin/dashtopatch
+++ b/bin/dashtopatch
@@ -5,33 +5,41 @@ 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
-base="gdb/master"
+if [ -f origin ];then
+  origin="`cat origin`"
+else
+  origin="origin/master"
+fi
+base=$origin
 gerrit=true
 if git branch -D gerrit;then
-  git checkout gdb/master
+  git checkout $origin
   git checkout -b gerrit
 else
   gerrit=false
 fi
 for elem in $(echo "$1"|tr '-' ' ');do
-  if [ "$base" = "gdb/master" ];then
+  if [ "$base" = $origin ];then
     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
-    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
-  git diff "$base" "$next"|diffdecvs >>"$next".patch
   if $gerrit;then
     cp "$next".patch dashtopatch.patch
     echo -e '/^--- /,$d\nw'|ed dashtopatch.patch