mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'jc/maint-index-pack-keep'
"git index-pack --keep[=<msg>] pack-$name.pack" simply did not work. * jc/maint-index-pack-keep: index-pack: correct --keep[=<msg>]
This commit is contained in:
commit
d4a22303ab
|
@ -1722,7 +1722,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) {
|
||||
|
|
|
@ -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' '
|
||||
|
|
Loading…
Reference in a new issue