Merge branch 'bc/object-id'

"uchar [40]" to "struct object_id" conversion continues.

* bc/object-id:
  wt-status: convert to struct object_id
  builtin/merge-base: convert to struct object_id
  Convert object iteration callbacks to struct object_id
  sha1_file: introduce an nth_packed_object_oid function
  refs: simplify parsing of reflog entries
  refs: convert each_reflog_ent_fn to struct object_id
  reflog-walk: convert struct reflog_info to struct object_id
  builtin/replace: convert to struct object_id
  Convert remaining callers of resolve_refdup to object_id
  builtin/merge: convert to struct object_id
  builtin/clone: convert to struct object_id
  builtin/branch: convert to struct object_id
  builtin/grep: convert to struct object_id
  builtin/fmt-merge-message: convert to struct object_id
  builtin/fast-export: convert to struct object_id
  builtin/describe: convert to struct object_id
  builtin/diff-tree: convert to struct object_id
  builtin/commit: convert to struct object_id
  hex: introduce parse_oid_hex

builtin/branch.c

@@ -33,7 +33,7 @@ static const char * const builtin_branch_usage[] = {
};

static const char *head;
static unsigned char head_sha1[20];
static struct object_id head_oid;

static int branch_use_color = -1;
static char branch_colors[][COLOR_MAXLEN] = {
@@ -118,13 +118,13 @@ static int branch_merged(int kind, const char *name,
	if (kind == FILTER_REFS_BRANCHES) {
		struct branch *branch = branch_get(name);
		const char *upstream = branch_get_upstream(branch, NULL);
		unsigned char sha1[20];
		struct object_id oid;

		if (upstream &&
		    (reference_name = reference_name_to_free =
		     resolve_refdup(upstream, RESOLVE_REF_READING,
				    sha1, NULL)) != NULL)
			reference_rev = lookup_commit_reference(sha1);
				    oid.hash, NULL)) != NULL)
			reference_rev = lookup_commit_reference(oid.hash);
	}
	if (!reference_rev)
		reference_rev = head_rev;
@@ -154,10 +154,10 @@ static int branch_merged(int kind, const char *name,
}

static int check_branch_commit(const char *branchname, const char *refname,
			       const unsigned char *sha1, struct commit *head_rev,
			       const struct object_id *oid, struct commit *head_rev,
			       int kinds, int force)
{
	struct commit *rev = lookup_commit_reference(sha1);
	struct commit *rev = lookup_commit_reference(oid->hash);
	if (!rev) {
		error(_("Couldn't look up commit object for '%s'"), refname);
		return -1;
@@ -184,7 +184,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
			   int quiet)
{
	struct commit *head_rev = NULL;
	unsigned char sha1[20];
	struct object_id oid;
	char *name = NULL;
	const char *fmt;
	int i;
@@ -211,7 +211,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
	}

	if (!force) {
		head_rev = lookup_commit_reference(head_sha1);
		head_rev = lookup_commit_reference(head_oid.hash);
		if (!head_rev)
			die(_("Couldn't look up commit object for HEAD"));
	}
@@ -239,7 +239,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
					RESOLVE_REF_READING
					| RESOLVE_REF_NO_RECURSE
					| RESOLVE_REF_ALLOW_BAD_NAME,
					sha1, &flags);
					oid.hash, &flags);
		if (!target) {
			error(remote_branch
			      ? _("remote-tracking branch '%s' not found.")
@@ -249,13 +249,13 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
		}

		if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) &&
		    check_branch_commit(bname.buf, name, sha1, head_rev, kinds,
		    check_branch_commit(bname.buf, name, &oid, head_rev, kinds,
					force)) {
			ret = 1;
			goto next;
		}

		if (delete_ref(NULL, name, is_null_sha1(sha1) ? NULL : sha1,
		if (delete_ref(NULL, name, is_null_oid(&oid) ? NULL : oid.hash,
			       REF_NODEREF)) {
			error(remote_branch
			      ? _("Error deleting remote-tracking branch '%s'")
@@ -271,7 +271,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
			       bname.buf,
			       (flags & REF_ISBROKEN) ? "broken"
			       : (flags & REF_ISSYMREF) ? target
			       : find_unique_abbrev(sha1, DEFAULT_ABBREV));
			       : find_unique_abbrev(oid.hash, DEFAULT_ABBREV));
		}
		delete_branch_config(bname.buf);

@@ -604,7 +604,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)

	track = git_branch_track;

	head = resolve_refdup("HEAD", 0, head_sha1, NULL);
	head = resolve_refdup("HEAD", 0, head_oid.hash, NULL);
	if (!head)
		die(_("Failed to resolve HEAD as a valid ref."));
	if (!strcmp(head, "HEAD"))

builtin/cat-file.c

@@ -409,20 +409,20 @@ static int batch_object_cb(const unsigned char sha1[20], void *vdata)
	return 0;
}

static int batch_loose_object(const unsigned char *sha1,
static int batch_loose_object(const struct object_id *oid,
			      const char *path,
			      void *data)
{
	sha1_array_append(data, sha1);
	sha1_array_append(data, oid->hash);
	return 0;
}

static int batch_packed_object(const unsigned char *sha1,
static int batch_packed_object(const struct object_id *oid,
			       struct packed_git *pack,
			       uint32_t pos,
			       void *data)
{
	sha1_array_append(data, sha1);
	sha1_array_append(data, oid->hash);
	return 0;
}

builtin/clone.c

@@ -681,7 +681,7 @@ static void update_head(const struct ref *our, const struct ref *remote,

static int checkout(int submodule_progress)
{
	unsigned char sha1[20];
	struct object_id oid;
	char *head;
	struct lock_file *lock_file;
	struct unpack_trees_options opts;
@@ -692,15 +692,15 @@ static int checkout(int submodule_progress)
	if (option_no_checkout)
		return 0;

	head = resolve_refdup("HEAD", RESOLVE_REF_READING, sha1, NULL);
	head = resolve_refdup("HEAD", RESOLVE_REF_READING, oid.hash, NULL);
	if (!head) {
		warning(_("remote HEAD refers to nonexistent ref, "
			  "unable to checkout.\n"));
		return 0;
	}
	if (!strcmp(head, "HEAD")) {
		if (advice_detached_head)
			detach_advice(sha1_to_hex(sha1));
			detach_advice(oid_to_hex(&oid));
	} else {
		if (!starts_with(head, "refs/heads/"))
			die(_("HEAD not found below refs/heads!"));
@@ -721,7 +721,7 @@ static int checkout(int submodule_progress)
	opts.src_index = &the_index;
	opts.dst_index = &the_index;

	tree = parse_tree_indirect(sha1);
	tree = parse_tree_indirect(oid.hash);
	parse_tree(tree);
	init_tree_desc(&t, tree->buffer, tree->size);
	if (unpack_trees(1, &t, &opts) < 0)
@@ -731,7 +731,7 @@ static int checkout(int submodule_progress)
		die(_("unable to write new index file"));

	err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1),
			   sha1_to_hex(sha1), "1", NULL);
			   oid_to_hex(&oid), "1", NULL);

	if (!err && option_recursive) {
		struct argv_array args = ARGV_ARRAY_INIT;

builtin/commit.c

@@ -496,7 +496,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
static int run_status(FILE *fp, const char *index_file, const char *prefix, int nowarn,
		      struct wt_status *s)
{
	unsigned char sha1[20];
	struct object_id oid;

	if (s->relative_paths)
		s->prefix = prefix;
@@ -509,9 +509,9 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int
	s->index_file = index_file;
	s->fp = fp;
	s->nowarn = nowarn;
	s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
	s->is_initial = get_sha1(s->reference, oid.hash) ? 1 : 0;
	if (!s->is_initial)
		hashcpy(s->sha1_commit, sha1);
		hashcpy(s->sha1_commit, oid.hash);
	s->status_format = status_format;
	s->ignore_submodule_arg = ignore_submodule_arg;

@@ -885,7 +885,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
		commitable = run_status(s->fp, index_file, prefix, 1, s);
		s->use_color = saved_color_setting;
	} else {
		unsigned char sha1[20];
		struct object_id oid;
		const char *parent = "HEAD";

		if (!active_nr && read_cache() < 0)
@@ -894,7 +894,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
		if (amend)
			parent = "HEAD^1";

		if (get_sha1(parent, sha1)) {
		if (get_sha1(parent, oid.hash)) {
			int i, ita_nr = 0;

			for (i = 0; i < active_nr; i++)
@@ -1332,7 +1332,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
{
	static struct wt_status s;
	int fd;
	unsigned char sha1[20];
	struct object_id oid;
	static struct option builtin_status_options[] = {
		OPT__VERBOSE(&verbose, N_("be verbose")),
		OPT_SET_INT('s', "short", &status_format,
@@ -1382,9 +1382,9 @@ int cmd_status(int argc, const char **argv, const char *prefix)

	fd = hold_locked_index(&index_lock, 0);

	s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
	s.is_initial = get_sha1(s.reference, oid.hash) ? 1 : 0;
	if (!s.is_initial)
		hashcpy(s.sha1_commit, sha1);
		hashcpy(s.sha1_commit, oid.hash);

	s.ignore_submodule_arg = ignore_submodule_arg;
	s.status_format = status_format;
@@ -1418,19 +1418,19 @@ static const char *implicit_ident_advice(void)

}

static void print_summary(const char *prefix, const unsigned char *sha1,
static void print_summary(const char *prefix, const struct object_id *oid,
			  int initial_commit)
{
	struct rev_info rev;
	struct commit *commit;
	struct strbuf format = STRBUF_INIT;
	unsigned char junk_sha1[20];
	struct object_id junk_oid;
	const char *head;
	struct pretty_print_context pctx = {0};
	struct strbuf author_ident = STRBUF_INIT;
	struct strbuf committer_ident = STRBUF_INIT;

	commit = lookup_commit(sha1);
	commit = lookup_commit(oid->hash);
	if (!commit)
		die(_("couldn't look up newly created commit"));
	if (parse_commit(commit))
@@ -1477,7 +1477,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1,
	rev.diffopt.break_opt = 0;
	diff_setup_done(&rev.diffopt);

	head = resolve_ref_unsafe("HEAD", 0, junk_sha1, NULL);
	head = resolve_ref_unsafe("HEAD", 0, junk_oid.hash, NULL);
	if (!strcmp(head, "HEAD"))
		head = _("detached HEAD");
	else
@@ -1522,8 +1522,8 @@ static int git_commit_config(const char *k, const char *v, void *cb)
	return git_status_config(k, v, s);
}

static int run_rewrite_hook(const unsigned char *oldsha1,
			    const unsigned char *newsha1)
static int run_rewrite_hook(const struct object_id *oldoid,
			    const struct object_id *newoid)
{
	struct child_process proc = CHILD_PROCESS_INIT;
	const char *argv[3];
@@ -1544,7 +1544,7 @@ static int run_rewrite_hook(const unsigned char *oldsha1,
	code = start_command(&proc);
	if (code)
		return code;
	strbuf_addf(&sb, "%s %s\n", sha1_to_hex(oldsha1), sha1_to_hex(newsha1));
	strbuf_addf(&sb, "%s %s\n", oid_to_hex(oldoid), oid_to_hex(newoid));
	sigchain_push(SIGPIPE, SIG_IGN);
	write_in_full(proc.in, sb.buf, sb.len);
	close(proc.in);
@@ -1636,7 +1636,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
	struct strbuf author_ident = STRBUF_INIT;
	const char *index_file, *reflog_msg;
	char *nl;
	unsigned char sha1[20];
	struct object_id oid;
	struct commit_list *parents = NULL;
	struct stat statbuf;
	struct commit *current_head = NULL;
@@ -1651,10 +1651,10 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
	status_format = STATUS_FORMAT_NONE; /* Ignore status.short */
	s.colopts = 0;

	if (get_sha1("HEAD", sha1))
	if (get_sha1("HEAD", oid.hash))
		current_head = NULL;
	else {
		current_head = lookup_commit_or_die(sha1, "HEAD");
		current_head = lookup_commit_or_die(oid.hash, "HEAD");
		if (parse_commit(current_head))
			die(_("could not parse HEAD commit"));
	}
@@ -1759,7 +1759,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
	}

	if (commit_tree_extended(sb.buf, sb.len, active_cache_tree->sha1,
			 parents, sha1, author_ident.buf, sign_commit, extra)) {
			 parents, oid.hash, author_ident.buf, sign_commit, extra)) {
		rollback_index_files();
		die(_("failed to write commit object"));
	}
@@ -1776,7 +1776,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)

	transaction = ref_transaction_begin(&err);
	if (!transaction ||
	    ref_transaction_update(transaction, "HEAD", sha1,
	    ref_transaction_update(transaction, "HEAD", oid.hash,
				   current_head
				   ? current_head->object.oid.hash : null_sha1,
				   0, sb.buf, &err) ||
@@ -1805,13 +1805,13 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
		cfg = init_copy_notes_for_rewrite("amend");
		if (cfg) {
			/* we are amending, so current_head is not NULL */
			copy_note_for_rewrite(cfg, current_head->object.oid.hash, sha1);
			copy_note_for_rewrite(cfg, current_head->object.oid.hash, oid.hash);
			finish_copy_notes_for_rewrite(cfg, "Notes added by 'git commit --amend'");
		}
		run_rewrite_hook(current_head->object.oid.hash, sha1);
		run_rewrite_hook(&current_head->object.oid, &oid);
	}
	if (!quiet)
		print_summary(prefix, sha1, !current_head);
		print_summary(prefix, &oid, !current_head);

	strbuf_release(&err);
	return 0;

builtin/count-objects.c

@@ -53,7 +53,7 @@ static void loose_garbage(const char *path)
		report_garbage(PACKDIR_FILE_GARBAGE, path);
}

static int count_loose(const unsigned char *sha1, const char *path, void *data)
static int count_loose(const struct object_id *oid, const char *path, void *data)
{
	struct stat st;

@@ -62,7 +62,7 @@ static int count_loose(const unsigned char *sha1, const char *path, void *data)
	else {
		loose_size += on_disk_bytes(st);
		loose++;
		if (verbose && has_sha1_pack(sha1))
		if (verbose && has_sha1_pack(oid->hash))
			packed_loose++;
	}
	return 0;