projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
961784e
)
merge-base: use the new lookup_commit_reference() helper function
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Wed, 18 May 2005 23:16:51 +0000
(16:16 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Wed, 18 May 2005 23:16:51 +0000
(16:16 -0700)
This allows you to use tags for merge bases.
merge-base.c
patch
|
blob
|
history
diff --git
a/merge-base.c
b/merge-base.c
index
2ea4497
..
6aa7f56
100644
(file)
--- a/
merge-base.c
+++ b/
merge-base.c
@@
-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;