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

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

* jc/maint-index-pack-keep:
  index-pack: correct --keep[=<msg>]
maint
Junio C Hamano 2016-03-03 13:16:45 -08:00
parent f02fbc4f94 0e94242df1
commit 13f0a6ddb9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/index-pack.c
View File

@ -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'"), die(_("packfile name '%s' does not end with '.pack'"),
pack_name); pack_name);
strbuf_add(&keep_name_buf, pack_name, len); 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; keep_name = keep_name_buf.buf;
} }
if (verify) { if (verify) {

6
t/t5300-pack-object.sh
View File

@ -284,6 +284,12 @@ test_expect_success \
git index-pack test-3.pack && git index-pack test-3.pack &&
cmp test-3.idx test-3-${packname_3}.idx && 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' ' test_expect_success 'unpacking with --strict' '