X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=KO;h=c39564f9cf758cc9a0876576e45c8059d3f68208;hb=bd8b47db1a26557181fe4e807dd282b96863b3e6;hp=f8decd210f0bfbc5649086b71e7600883f3b8621;hpb=1ad3ae4c173bd0557f0d0ebdf438db0f034710e1;p=git.git diff --git a/KO b/KO index f8decd21..c39564f9 100755 --- a/KO +++ b/KO @@ -4,11 +4,12 @@ # I do not accidentally push a rewound master to public. git fetch ko -mb=$(git-merge-base ko-master master) -h=$(git-rev-parse $mb ko-master | sort -u | wc -l) +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." + exit 1 fi git show-branch ko-master master git show-branch ko-maint maint