Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'fk/blame' into next
[gitweb.git]
/
merge-base.c
diff --git
a/merge-base.c
b/merge-base.c
index 751c3c281b8803ccb83a9de99c3ab5d63039c377..e73fca7453e8141b3f371a1aeba483c9ed946ccc 100644
(file)
--- a/
merge-base.c
+++ b/
merge-base.c
@@
-236,6
+236,8
@@
int main(int argc, char **argv)
struct commit *rev1, *rev2;
unsigned char rev1key[20], rev2key[20];
+ setup_git_directory();
+
while (1 < argc && argv[1][0] == '-') {
char *arg = argv[1];
if (!strcmp(arg, "-a") || !strcmp(arg, "--all"))