branch: convert to struct object_id
This change is required to convert lookup_commit_reference later. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
May 1, 2017 at 02:29 UTC
48713bfa2e5aba8bbc0a53d5d34d7940d2d756e3
1 file changed
+8
-8
branch.c
+8
-8
@@ -191,9 +191,9 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
191
192
if (!attr_only) {
193
const char *head;
194
- unsigned char sha1[20];
194
+ struct object_id oid;
195
196
- head = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
196
+ head = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL);
197
if (!is_bare_repository() && head && !strcmp(head, ref->buf))
198
die(_("Cannot force update the current branch."));
199
}
@@ -233,7 +233,7 @@ void create_branch(const char *name, const char *start_name,
233
int quiet, enum branch_track track)
234
{
235
struct commit *commit;
236
- unsigned char sha1[20];
236
+ struct object_id oid;
237
char *real_ref;
238
struct strbuf ref = STRBUF_INIT;
239
int forcing = 0;
@@ -253,7 +253,7 @@ void create_branch(const char *name, const char *start_name,
253
}
254
255
real_ref = NULL;
256
- if (get_sha1(start_name, sha1)) {
256
+ if (get_oid(start_name, &oid)) {
257
if (explicit_tracking) {
258
if (advice_set_upstream_failure) {
259
error(_(upstream_missing), start_name);
@@ -265,7 +265,7 @@ void create_branch(const char *name, const char *start_name,
265
die(_("Not a valid object name: '%s'."), start_name);
266
}
267
268
- switch (dwim_ref(start_name, strlen(start_name), sha1, &real_ref)) {
268
+ switch (dwim_ref(start_name, strlen(start_name), oid.hash, &real_ref)) {
269
case 0:
270
/* Not branching from any existing branch */
271
if (explicit_tracking)
@@ -286,9 +286,9 @@ void create_branch(const char *name, const char *start_name,
286
break;
287
}
288
289
- if ((commit = lookup_commit_reference(sha1)) == NULL)
289
+ if ((commit = lookup_commit_reference(oid.hash)) == NULL)
290
die(_("Not a valid branch point: '%s'."), start_name);
291
- hashcpy(sha1, commit->object.oid.hash);
291
+ oidcpy(&oid, &commit->object.oid);
292
293
if (reflog)
294
log_all_ref_updates = LOG_REFS_NORMAL;
@@ -306,7 +306,7 @@ void create_branch(const char *name, const char *start_name,
306
transaction = ref_transaction_begin(&err);
307
if (!transaction ||
308
ref_transaction_update(transaction, ref.buf,
309
- sha1, forcing ? NULL : null_sha1,
309
+ oid.hash, forcing ? NULL : null_sha1,
310
0, msg, &err) ||
311
ref_transaction_commit(transaction, &err))
312
die("%s", err.buf);