summaryrefslogtreecommitdiff
path: root/builtin/index-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-15 01:37:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-15 01:37:16 (GMT)
commit1d1cbe224f280be2a270274a4e843ceccbe1a030 (patch)
treecb5a1a882a7ed4421ed9bead859f1a01716afacc /builtin/index-pack.c
parent9fabc7083275f455ef21123cbdcbdd31b21a8251 (diff)
parentbfee614a2f5838e03378888d78e8247b8400d5ce (diff)
downloadgit-1d1cbe224f280be2a270274a4e843ceccbe1a030.zip
git-1d1cbe224f280be2a270274a4e843ceccbe1a030.tar.gz
git-1d1cbe224f280be2a270274a4e843ceccbe1a030.tar.bz2
Merge branch 'jc/index-pack' into maint
Code clean-up. * jc/index-pack: index-pack: add a helper function to derive .idx/.keep filename index-pack: correct --keep[=<msg>]
Diffstat (limited to 'builtin/index-pack.c')
-rw-r--r--builtin/index-pack.c35
1 files changed, 17 insertions, 18 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 4524519..2d1eb8b 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -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 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);
if (fix_thin_pack && !from_stdin)
die(_("--fix-thin cannot be used without --stdin"));
- if (!index_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(&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, ".idx");
- keep_name = keep_name_buf.buf;
- }
+ if (!index_name && pack_name)
+ index_name = derive_filename(pack_name, ".idx", &index_name_buf);
+ if (keep_msg && !keep_name && pack_name)
+ keep_name = derive_filename(pack_name, ".keep", &keep_name_buf);
+
if (verify) {
if (!index_name)
die(_("--verify with no packfile name given"));