Merge branch 'bw/commit-partial-from-subdirectory-fix'

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 24f6c7193546b91a8644a4417bfc6d6d94da6a62..3b7600150b66c4bf814e21b74b2d931f44c83805 100644 (file)
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -158,7 +158,7 @@ static int handle_fork_point(int argc, const char **argv)
        struct commit_list *bases;
        int i, ret = 0;
 
-       switch (dwim_ref(argv[0], strlen(argv[0]), oid.hash, &refname)) {
+       switch (dwim_ref(argv[0], strlen(argv[0]), &oid, &refname)) {
        case 0:
                die("No such ref: '%s'", argv[0]);
        case 1: