E R <pc88mxer@xxxxxxxxx> writes:
> Given two commits c1 and c2, is it possible to ask git if there are
> any commits in the repository that were created by either a sequence
> of commands like:
>
> git checkout c1
> git merge c2
>
> or:
>
> git checkout c2
> git merge c1
>
> with any required conflict resolution?
>
> That is, I don't want to merge c1 and c2 myself, but I want to know if
> someone else has merged c1 and c2, performed any conflict resolution
> and committed the result.
I assume that commits c1 and c2 are not one ancestor of the other (are
not in fast-forward relation).
Translating your question into question about DAG of revisions, you
want to check if there is branch for which both c1 and c2 are
reachable from:
c1sha=$(git rev-parse c1)
c2sha=$(git rev-parse c2)
git for-each-ref --format="%(refname)" refs/heads/ |
while read refname
do
b1=$(git merge-base c1 $refname)
b2=$(git merge-base c2 $refname)
if [ "$b1" = "$c1sha" -a "$b2" = "$c2sha" ]
then
print ${refname#refs/heads/}
fi
done
Instead of comparing git-merge-base with SHA-1 of c1 and c2
respoectively, you can count commits:
git for-each-ref --format="%(refname)" refs/heads/ |
while read refname
do
count1=$(git rev-list c1..$refname | wc -l)
count2=$(git rev-list c2..$refname | wc -l)
if [ "$count1" > 0 -a "$count2" > 0 ]
then
print ${refname#refs/heads/}
fi
done
Not tested!
--
Jakub Narebski
Poland
ShadeHawk on #git
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html