X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fdashtopatch;h=03ae6529a175637629b33acc26af371310c3f157;hp=fb3d4fd4c0b41b20c5e8d8d36b69a8b5aeda1881;hb=f1fd1da97405a124a824d3808d6bc59df1b16b9b;hpb=4243605851773a10d2db6ef4c0b8f228d4e24c07

diff --git a/bin/dashtopatch b/bin/dashtopatch
index fb3d4fd..03ae652 100755
--- a/bin/dashtopatch
+++ b/bin/dashtopatch
@@ -1,19 +1,17 @@
 #! /bin/sh
 set -ex
-if [ "$1" = "-f" ];then
-  force=true
-  shift
-elif [ -n "$(/bin/ls *.patch 2>/dev/null|tee /proc/self/fd/2)" ];then
-  echo >&2 "Some *.patch files exist!"
-  exit 1
-else
-  force=false
-fi
 if [ $# != 1 ] || ! echo "$1" | grep -q '-';then
   echo >&2 "Syntax: $0 branch-list-delimited-by-dashes"
   exit 1
 fi
 base="master"
+gerrit=true
+if git branch -D gerrit;then
+  git checkout master
+  git checkout -b gerrit
+else
+  gerrit=false
+fi
 for elem in $(echo "$1"|tr '-' ' ');do
   if [ "$base" = "master" ];then
     next="$elem"
@@ -22,13 +20,19 @@ for elem in $(echo "$1"|tr '-' ' ');do
   fi
   git checkout "$next"
   git merge "$base"
-  if $force;then
-    echo -e '/^--- /,$d\nw'|ed "$next".patch
-  else
-    rm -f "$next".patch
+  if [ -e "$next".patch ];then
+    echo -e '/^--- /,$d\nw'|ed "$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
-git checkout master
+git checkout "$next"
 echo OK