From: Junio C Hamano Date: Thu, 29 Sep 2011 01:14:23 +0000 (-0700) Subject: Meta/KO: allow checking against mirror sites other than k.org X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b5333e7df9273c05615d0043bbbab43ba5c1bba;p=thirdparty%2Fgit.git Meta/KO: allow checking against mirror sites other than k.org --- diff --git a/KO b/KO index 2d7346ff7b..72a10c88c9 100755 --- a/KO +++ b/KO @@ -3,16 +3,30 @@ # Not for general consumption; a script I used to make sure # I do not accidentally push a rewound master to public. -case "$1" in --no-fetch) shift ;; *) git fetch ko ;; esac +no_fetch= ko=ko +while : +do + case "$#,$1" in + 0,*) break ;; + *,--no-fetch) no_fetch=t; shift ;; + *,--*) echo >&2 "unknown option $1"; exit 1 ;; + *) ko=$1; shift ;; + esac +done -mb=$(git merge-base ko/master master) -h=$(git rev-parse $mb ko/master | sort -u | wc -l) +if test -z "$no_fetch" +then + git fetch "$ko" +fi + +mb=$(git merge-base $ko/master master) +h=$(git rev-parse $mb $ko/master | sort -u | wc -l) if test "$h" != 1 then - echo "OOOOOPPPPPPPPPPPPPPSSS! master is not ko/master fast forward." + echo "OOOOOPPPPPPPPPPPPPPSSS! master is not $ko/master fast forward." exit 1 fi -git show-branch --topo-order ko/master master -git show-branch --topo-order ko/maint maint -git show-branch --topo-order ko/next next -git show-branch --topo-order ko/pu pu +git show-branch --topo-order $ko/master master +git show-branch --topo-order $ko/maint maint +git show-branch --topo-order $ko/next next +git show-branch --topo-order $ko/pu pu