Skip to content

builtin/mktree: remove USE_THE_REPOSITORY_VARIABLE #2238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
malon7782 wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −10
Open

builtin/mktree: remove USE_THE_REPOSITORY_VARIABLE #2238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions builtin/mktree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*
* Copyright (c) Junio C Hamano, 2006, 2009
*/
#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h"
#include "gettext.h"
#include "hex.h"
Expand Down Expand Up @@ -46,7 +45,7 @@ static int ent_compare(const void *a_, const void *b_)
b->name, b->len, b->mode);
}

static void write_tree(struct object_id *oid)
static void write_tree(struct repository *repo, struct object_id *oid)
{
struct strbuf buf;
size_t size;
Expand All @@ -60,10 +59,10 @@ static void write_tree(struct object_id *oid)
for (i = 0; i < used; i++) {
struct treeent *ent = entries[i];
strbuf_addf(&buf, "%o %s%c", ent->mode, ent->name, '\0');
strbuf_add(&buf, ent->oid.hash, the_hash_algo->rawsz);
strbuf_add(&buf, ent->oid.hash, repo->hash_algo->rawsz);
}

odb_write_object(the_repository->objects, buf.buf, buf.len, OBJ_TREE, oid);
odb_write_object(repo->objects, buf.buf, buf.len, OBJ_TREE, oid);
strbuf_release(&buf);
}

Expand All @@ -72,7 +71,7 @@ static const char *const mktree_usage[] = {
NULL
};

static void mktree_line(char *buf, int nul_term_line, int allow_missing)
static void mktree_line(struct repository *repo, char *buf, int nul_term_line, int allow_missing)
{
char *ptr, *ntr;
const char *p;
Expand All @@ -93,7 +92,7 @@ static void mktree_line(char *buf, int nul_term_line, int allow_missing)
die("input format error: %s", buf);
ptr = ntr + 1; /* type */
ntr = strchr(ptr, ' ');
if (!ntr || parse_oid_hex(ntr + 1, &oid, &p) ||
if (!ntr || parse_oid_hex_algop(ntr + 1, &oid, &p, repo->hash_algo) ||
*p != '\t')
die("input format error: %s", buf);

Expand Down Expand Up @@ -124,7 +123,7 @@ static void mktree_line(char *buf, int nul_term_line, int allow_missing)

/* Check the type of object identified by oid without fetching objects */
oi.typep = &obj_type;
if (odb_read_object_info_extended(the_repository->objects, &oid, &oi,
if (odb_read_object_info_extended(repo->objects, &oid, &oi,
OBJECT_INFO_LOOKUP_REPLACE |
OBJECT_INFO_QUICK |
OBJECT_INFO_SKIP_FETCH_OBJECT) < 0)
Expand Down Expand Up @@ -155,7 +154,7 @@ static void mktree_line(char *buf, int nul_term_line, int allow_missing)
int cmd_mktree(int ac,
const char **av,
const char *prefix,
struct repository *repo UNUSED)
struct repository *repo)
{
struct strbuf sb = STRBUF_INIT;
struct object_id oid;
Expand Down Expand Up @@ -187,7 +186,7 @@ int cmd_mktree(int ac,
break;
die("input format error: (blank line only valid in batch mode)");
}
mktree_line(sb.buf, nul_term_line, allow_missing);
mktree_line(repo, sb.buf, nul_term_line, allow_missing);
}
if (is_batch_mode && got_eof && used < 1) {
/*
Expand All @@ -197,7 +196,7 @@ int cmd_mktree(int ac,
*/
; /* skip creating an empty tree */
} else {
write_tree(&oid);
write_tree(repo, &oid);
puts(oid_to_hex(&oid));
fflush(stdout);
}
Expand Down
Loading