3 # Watches for merges that had only local merges (e.g. should have been rebases).
5 # If they are introducing non-merge commits /and/ merge commits, it could
6 # look like one of two ways. This way:
8 # * --- B --- * --- oldrev
10 # new --- new --- newrev
12 # They basically had an un-shared local dev branch (probably by making a
13 # merge) and instead should have done a rebase. Also, if they did:
15 # * --- B --- * --- oldrev
17 # new --- new --- new -- newrev
19 # We should try and catch them--where the merge happened previously to
20 # them doing more work in the newrev commit.
22 # But if it looks like:
24 # * --- B --- * --- oldrev
26 # old --- new --- newrev
28 # Then they had a pre-shared branch that cannot be rebased and so they
29 # were correct in doing a merge to tie "old" and "oldrev" together.
31 # Also, we obviously have to be okay with:
33 # * --- * --- * --- oldrev --- new --- new --- newrev
39 if expr "$oldrev" : '0*$' >/dev/null ; then
43 # Read backwards: all commits from old..new, unless they are already referenced by a branch
44 git rev-parse --not --branches | git rev-list --stdin $oldrev..$newrev | while read commit ; do
45 number_of_parents=$(git rev-list -n 1 --parents $commit | sed 's/ /\n/g' | grep -v $commit | wc -l)
46 if [[ $number_of_parents > 1 ]] ; then
47 # Hack to not interfer with the update-stable "--no-ff" method
48 if [[ "$refname" == "refs/heads/stable" && "$commit" == "$newrev" ]] ; then
52 # Find the original branch point (B)
53 parents=$(git rev-list -n 1 --parents $commit | sed 's/ /\n/g' | grep -v $commit)
56 git merge-base --all $parents | while read baserev ; do
58 git rev-list -n 1 --parents $commit | sed 's/ /\n/g' | grep -v $commit | while read parent ; do
59 all_commits=$(git rev-list --first-parent $baserev..$parent | wc -l)
60 new_commits=$(git rev-parse --not --branches | git rev-list --stdin $baserev..$parent | wc -l)
61 if [[ $all_commits -eq $new_commits ]] ; then
62 echo "----------------------------------------------------"
64 echo "It looks like you should rebase instead of merging $commit"
66 echo "----------------------------------------------------"
70 if [ $? -ne 0 ] ; then
74 if [ $? -ne 0 ] ; then