From: Rudolf Polzer Date: Wed, 4 Aug 2010 10:40:57 +0000 (+0200) Subject: properly ignore merges in upstream rebase detection X-Git-Tag: xonotic-v0.1.0preview~338^2 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=64e26c2fba740409c370ca95aed0e5cfb1ee59a1;ds=sidebyside properly ignore merges in upstream rebase detection --- diff --git a/all b/all index df63f12c..c1da7075 100755 --- a/all +++ b/all @@ -194,8 +194,8 @@ fix_upstream_rebase() # no merge-base? upstream did filter-branch if [ -n "$r_base" ]; then # otherwise, check if the two histories are "similar" - r_l_me=`git log --pretty="format:%s" "$r_other".."$r_me" | grep -v "^Merged" | sort -u` - r_l_other=`git log --pretty="format:%s" "$r_me".."$r_other" | grep -v "^Merged" | sort -u` + r_l_me=`git log --pretty="format:%s" "$r_other".."$r_me" | grep -v "^Merge" | sort -u` + r_l_other=`git log --pretty="format:%s" "$r_me".."$r_other" | grep -v "^Merge" | sort -u` # heuristics: upstream rebase/filter-branch if more than 50% of the commits of one of the sides are in the other too r_lc_me=`echo "$r_l_me" | wc -l`