Meta/GRADUATED: exclude topics whose fork-points are on master
Junio C Hamano committed
Feb 1, 2013 at 14:04 UTC
872e2ef810ab1e2a63d4d0d7eb5f54f5ff0fdcee
1 file changed
+9
GRADUATED
+9
@@ -65,6 +65,13 @@ one_topic () {
65
case " $topics" in *" $topic "*) return ;; esac
66
topics="$topics$topic "
67
68
+ contam_count=$(git rev-list "maint..$tip" | grep -F "$merges_to_master" | wc -l)
69
+ if test "$contam_count" != 0
70
+ then
71
+ echo "**** forked from master $topic ****"
72
+ return
73
+ fi
74
+
75
maint_count=$(git rev-list "maint..$tip" | wc -l)
76
if test "$maint_count" = 0
77
then
@@ -120,6 +127,8 @@ one_topic () {
127
esac
128
}
129
130
+merges_to_master="$(git rev-list --merges $base..master)"
131
+
132
git log --first-parent --min-parents=2 --max-parents=2 \
133
--format='%ci %H %P %s' "$base..master" | {
134
while read date time zone commit parent tip subject