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

gitster · gitster · commit 13f0a6ddb94a · 2016-03-03T13:16:45.000-08:00
* jc/maint-index-pack-keep:
  index-pack: correct --keep[=&lt;msg&gt;]
diff --git 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
@@ -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' '

Original file line number	Diff line number	Diff line change
`@@ -1721,7 +1721,7 @@ int cmd_index_pack(int argc, const char *argv, const char prefix)`
`1721`	`1721`	`die(_("packfile name '%s' does not end with '.pack'"),`
`1722`	`1722`	`pack_name);`
`1723`	`1723`	`strbuf_add(&keep_name_buf, pack_name, len);`
`1724`		`- strbuf_addstr(&keep_name_buf, ".idx");`
	`1724`	`+ strbuf_addstr(&keep_name_buf, ".keep");`
`1725`	`1725`	`keep_name = keep_name_buf.buf;`
`1726`	`1726`	`}`
`1727`	`1727`	`if (verify) {`