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

diff --git a/bin/dashtopatch b/bin/dashtopatch
index 901db5a..a70dff1 100755
--- a/bin/dashtopatch
+++ b/bin/dashtopatch
@@ -33,11 +33,13 @@ for elem in $(echo "$1"|tr '-' ' ');do
   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
-  git diff -U9999999 --binary "$base" "$next" --            >"$next".Upatch
   if $gerrit;then
     cp "$next".patch dashtopatch.patch
     echo -e '/^--- /,$d\nw'|ed dashtopatch.patch