diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-03 13:16:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-03 13:16:45 -0800 |
| commit | 13f0a6ddb94a16736000cb86f4cb39ed681e7c5d (patch) | |
| tree | 305b4a1bf817f972838dfe26d41fbcccf15164e8 | |
| parent | f02fbc4f9433937ee0463d0342d6d7d97e1f6f1e (diff) | |
| parent | 0e94242df1ba11830c5443a55decaa041fa97710 (diff) | |
| download | git-13f0a6ddb94a16736000cb86f4cb39ed681e7c5d.tar.gz | |
Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
* jc/maint-index-pack-keep:
index-pack: correct --keep[=<msg>]
| -rw-r--r-- | builtin/index-pack.c | 2 | ||||
| -rwxr-xr-x | t/t5300-pack-object.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 193908a619..285424f3d4 100644 --- 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 fc2be63e02..899e52d50f 100755 --- 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' ' |