summaryrefslogtreecommitdiff
path: root/branch.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2017-10-28 09:27:15 +0200
committerMichael Haggerty <mhagger@alum.mit.edu>2017-10-28 09:27:15 +0200
commitff08e56cde739152a59a86f5aa996954a2ec0614 (patch)
tree9c7bc94151c5a082377ecb438e66aea140924edb /branch.c
parent2f899857a9f425cb59f8a15c2ea7a52100c51a23 (diff)
parent4f01e5080c4a7eee69da47c958888358e6127584 (diff)
Merge branch 'bc/object-id' into base
Diffstat (limited to 'branch.c')
-rw-r--r--branch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/branch.c b/branch.c
index 4377ce2fb1..62f7b0d8c2 100644
--- a/branch.c
+++ b/branch.c
@@ -264,7 +264,7 @@ void create_branch(const char *name, const char *start_name,
die(_("Not a valid object name: '%s'."), start_name);
}
- switch (dwim_ref(start_name, strlen(start_name), oid.hash, &real_ref)) {
+ switch (dwim_ref(start_name, strlen(start_name), &oid, &real_ref)) {
case 0:
/* Not branching from any existing branch */
if (explicit_tracking)
@@ -305,7 +305,7 @@ void create_branch(const char *name, const char *start_name,
transaction = ref_transaction_begin(&err);
if (!transaction ||
ref_transaction_update(transaction, ref.buf,
- oid.hash, forcing ? NULL : null_sha1,
+ &oid, forcing ? NULL : &null_oid,
0, msg, &err) ||
ref_transaction_commit(transaction, &err))
die("%s", err.buf);