kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/index-pack' 

Code clean-up.

* jc/index-pack:
  index-pack: add a helper function to derive .idx/.keep filename
maint
Junio C Hamano 2016-04-03 10:29:31 -07:00
parent 9081cffd1e bfee614a2f
commit 3583bf594d
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
builtin/index-pack.c
View File

@ -1599,6 +1599,18 @@ static void show_pack_info(int stat_only)
} }
} }


static const char *derive_filename(const char *pack_name, const char *suffix,
struct strbuf *buf)
{
size_t len;
if (!strip_suffix(pack_name, ".pack", &len))
die(_("packfile name '%s' does not end with '.pack'"),
pack_name);
strbuf_add(buf, pack_name, len);
strbuf_addstr(buf, suffix);
return buf->buf;
}

int cmd_index_pack(int argc, const char **argv, const char *prefix) int cmd_index_pack(int argc, const char **argv, const char *prefix)
{ {
int i, fix_thin_pack = 0, verify = 0, stat_only = 0; int i, fix_thin_pack = 0, verify = 0, stat_only = 0;
@ -1707,24 +1719,11 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
usage(index_pack_usage); usage(index_pack_usage);
if (fix_thin_pack && !from_stdin) if (fix_thin_pack && !from_stdin)
die(_("--fix-thin cannot be used without --stdin")); die(_("--fix-thin cannot be used without --stdin"));
if (!index_name && pack_name) { if (!index_name && pack_name)
size_t len; index_name = derive_filename(pack_name, ".idx", &index_name_buf);
if (!strip_suffix(pack_name, ".pack", &len)) if (keep_msg && !keep_name && pack_name)
die(_("packfile name '%s' does not end with '.pack'"), keep_name = derive_filename(pack_name, ".keep", &keep_name_buf);
pack_name);
strbuf_add(&index_name_buf, pack_name, len);
strbuf_addstr(&index_name_buf, ".idx");
index_name = index_name_buf.buf;
}
if (keep_msg && !keep_name && pack_name) {
size_t len;
if (!strip_suffix(pack_name, ".pack", &len))
die(_("packfile name '%s' does not end with '.pack'"),
pack_name);
strbuf_add(&keep_name_buf, pack_name, len);
strbuf_addstr(&keep_name_buf, ".keep");
keep_name = keep_name_buf.buf;
}
if (verify) { if (verify) {
if (!index_name) if (!index_name)
die(_("--verify with no packfile name given")); die(_("--verify with no packfile name given"));