Merge branch 'jc/maint-index-pack-keep' into jc/index-pack

* jc/maint-index-pack-keep:
index-pack: correct --keep[=<msg>]

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 193908a619307ff38bacb212bd0450aae53e2510..285424f3d4ed66e4d9ae18abedbb4ab04948fa21 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1721,7 +1721,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
                        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");
+               strbuf_addstr(&keep_name_buf, ".keep");
                keep_name = keep_name_buf.buf;
        }
        if (verify) {

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index fc2be63e02d85682cd24457ee646c8c626ca967a..899e52d50f0d73e4a755c4f7991364f34912b336 100755 (executable)
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -284,6 +284,12 @@ test_expect_success \
      git index-pack test-3.pack &&
      cmp test-3.idx test-3-${packname_3}.idx &&
 
+     cat test-1-${packname_1}.pack >test-4.pack &&
+     rm -f test-4.keep &&
+     git index-pack --keep=why test-4.pack &&
+     cmp test-1-${packname_1}.idx test-4.idx &&
+     test -f test-4.keep &&
+
      :'
 
 test_expect_success 'unpacking with --strict' '