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
Assume -f.
[nethome.git]
/
bin
/
dashtopatch
diff --git
a/bin/dashtopatch
b/bin/dashtopatch
index
fb3d4fd
..
3661ccf
100755
(executable)
--- a/
bin/dashtopatch
+++ b/
bin/dashtopatch
@@
-1,14
+1,5
@@
#! /bin/sh
set -ex
#! /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
if [ $# != 1 ] || ! echo "$1" | grep -q '-';then
echo >&2 "Syntax: $0 branch-list-delimited-by-dashes"
exit 1
@@
-22,13
+13,10
@@
for elem in $(echo "$1"|tr '-' ' ');do
fi
git checkout "$next"
git merge "$base"
fi
git checkout "$next"
git merge "$base"
- if
$force
;then
+ if
[ -e "$next".patch ]
;then
echo -e '/^--- /,$d\nw'|ed "$next".patch
echo -e '/^--- /,$d\nw'|ed "$next".patch
- else
- rm -f "$next".patch
fi
git diff "$base" "$next"|diffdecvs >>"$next".patch
base="$next"
done
fi
git diff "$base" "$next"|diffdecvs >>"$next".patch
base="$next"
done
-git checkout master
echo OK
echo OK