Meta/Reintegrate: stop at a cut ### line
Junio C Hamano committed
Apr 27, 2012 at 13:41 UTC
0768d27d1df4410cb16d148b56451a89623a9a83
1 file changed
+11
-1
Reintegrate
+11
-1
@@ -1,11 +1,13 @@
1
#!/bin/sh
2
3
-accept_rerere="--rerere-autoupdate" generate=no update= diff= edit=
3
+accept_rerere="--rerere-autoupdate" generate=no update= diff= edit= stop_at_cut=
4
while case "$#,$1" in 0,*) break;; *,-*) ;; esac
5
do
6
case "$1" in
7
-n) accept_rerere= ;;
8
-e) edit=t ;;
9
+ -c) stop_at_cut=1 ;;
10
+ -c?*) stop_at_cut=${1#-c} ;;
11
-d) update=${2?"diff with what?"}
12
diff=yes
13
generate=yes
@@ -78,9 +80,17 @@ no)
80
fi
81
}
82
83
+ cut_seen=0
84
while read branch eh
85
do
86
+ case "$branch" in '###') cut_seen=$(( $cut_seen + 1 )) ;; esac
87
+ if test -n "$stop_at_cut" && test $stop_at_cut -le $cut_seen
88
+ then
89
+ continue
90
+ fi
91
+
92
case "$branch" in '#'* | '') continue ;; esac
93
+
94
case "$eh" in
95
"" | "#"*)
96
echo >&2 "* $branch"