git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-22 14:20:10 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

merge-base: use the new lookup_commit_reference() helper function

Browse Source 
This allows you to use tags for merge bases.
This commit is contained in:
Linus Torvalds
2005-05-18 16:16:51 -07:00
parent 961784ee42
commit 9b632be30c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
merge-base.c
View File

@@ -62,8 +62,8 @@ int main(int argc, char **argv)
get_sha1(argv[2], rev2key)) {
usage("merge-base <commit-id> <commit-id>");
}
rev1 = lookup_commit(rev1key);
rev2 = lookup_commit(rev2key);
rev1 = lookup_commit_reference(rev1key);
rev2 = lookup_commit_reference(rev2key);
ret = common_ancestor(rev1, rev2);
if (!ret)
return 1;