more typo fixing :)

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 14d2eeb602bf4c258ad9063ceb48bb4f024d61ba..df63f12ce74f9d2c7e3228e16354732e7f8013ac 100755 (executable)
--- a/all
+++ b/all
@@ -203,8 +203,8 @@ fix_upstream_rebase()
                r_lc_together=`{ echo "$r_l_me"; echo "$r_l_other"; } | sort -u | wc -l`
                r_lc_same=$(($r_lc_me + $r_lc_other - $r_lc_together))
 
-               if [ $(( $r_lc_same * 2 )) -le $(( $r_lc_me )) ] && [ $(( $r_lc_same * 2 )) -le $(( $r_lc_other )) ]; then
-                       if yesno "Probable upstream rebase detected, automatically fix?" 'git log --oneline --graph --left-right "$r_l_other".."$r_l_me"'; then
+               if [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_me )) ] || [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_other )) ]; then
+                       if yesno "Probable upstream rebase detected, automatically fix?" 'git log --oneline --graph --date-order --left-right "$r_other"..."$r_me"'; then
                                git reset --hard "$r_me"
                                git pull --rebase
                                return 1
@@ -232,7 +232,8 @@ fix_upstream_rebase_mergefail()
 case "$cmd" in
        fix_upstream_rebase)
                for d in $repos; do
-                       fix_upstream_rebase_mergefail && fix_upstream_rebase_mergeok
+                       enter "$d0/$d" verbose
+                       verbose fix_upstream_rebase_mergefail && verbose fix_upstream_rebase_mergeok
                done
                ;;
        update|pull)