diff options
author | Junio C Hamano <junkio@cox.net> | 2005-12-03 23:46:02 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-12-03 23:46:02 -0800 |
commit | 423325a2d24638ddcc82ce47be5e40be550f4507 (patch) | |
tree | 00960b001d786299d3da04a4467bd0c798bf8cda /merge-base.c | |
parent | 93dcab2937624ebb97f91807576cddb242a55a46 (diff) | |
parent | d79374c7b58d3814ffdc277de608243f8e665e3a (diff) | |
download | git-423325a2d24638ddcc82ce47be5e40be550f4507.tar.gz git-423325a2d24638ddcc82ce47be5e40be550f4507.tar.xz |
Diffstat (limited to 'merge-base.c')
-rw-r--r-- | merge-base.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-base.c b/merge-base.c index 751c3c281..e73fca745 100644 --- 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")) |