10
#include <signal.h>
11
12
static const char index_pack_usage[] =
13
-"git-index-pack [-v] [-o <index-file>] { <pack-file> | --stdin [--fix-thin] [<pack-file>] }";
13
+"git-index-pack [-v] [-o <index-file>] [{ ---keep | --keep=<msg> }] { <pack-file> | --stdin [--fix-thin] [<pack-file>] }";
14
15
struct object_entry
16
{
754
755
static void final(const char *final_pack_name, const char *curr_pack_name,
756
const char *final_index_name, const char *curr_index_name,
757
+ const char *keep_name, const char *keep_msg,
758
unsigned char *sha1)
759
{
760
char name[PATH_MAX];
781
}
782
}
783
784
+ if (keep_msg) {
785
+ int keep_fd, keep_msg_len = strlen(keep_msg);
786
+ if (!keep_name) {
787
+ snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
788
+ get_object_directory(), sha1_to_hex(sha1));
789
+ keep_name = name;
790
+ }
791
+ keep_fd = open(keep_name, O_RDWR | O_CREAT, 0600);
792
+ if (keep_fd < 0)
793
+ die("cannot write keep file");
794
+ if (keep_msg_len > 0) {
795
+ write_or_die(keep_fd, keep_msg, keep_msg_len);
796
+ write_or_die(keep_fd, "\n", 1);
797
+ }
798
+ close(keep_fd);
799
+ }
800
+
801
if (final_pack_name != curr_pack_name) {
802
if (!final_pack_name) {
803
snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
825
int i, fix_thin_pack = 0;
826
const char *curr_pack, *pack_name = NULL;
827
const char *curr_index, *index_name = NULL;
810
- char *index_name_buf = NULL;
828
+ const char *keep_name = NULL, *keep_msg = NULL;
829
+ char *index_name_buf = NULL, *keep_name_buf = NULL;
830
unsigned char sha1[20];
831
832
for (i = 1; i < argc; i++) {
837
from_stdin = 1;
838
} else if (!strcmp(arg, "--fix-thin")) {
839
fix_thin_pack = 1;
840
+ } else if (!strcmp(arg, "--keep")) {
841
+ keep_msg = "";
842
+ } else if (!strncmp(arg, "--keep=", 7)) {
843
+ keep_msg = arg + 7;
844
} else if (!strcmp(arg, "-v")) {
845
verbose = 1;
846
} else if (!strcmp(arg, "-o")) {
871
strcpy(index_name_buf + len - 5, ".idx");
872
index_name = index_name_buf;
873
}
874
+ if (keep_msg && !keep_name && pack_name) {
875
+ int len = strlen(pack_name);
876
+ if (!has_extension(pack_name, ".pack"))
877
+ die("packfile name '%s' does not end with '.pack'",
878
+ pack_name);
879
+ keep_name_buf = xmalloc(len);
880
+ memcpy(keep_name_buf, pack_name, len - 5);
881
+ strcpy(keep_name_buf + len - 5, ".keep");
882
+ keep_name = keep_name_buf;
883
+ }
884
885
curr_pack = open_pack_file(pack_name);
886
parse_pack_header();
913
}
914
free(deltas);
915
curr_index = write_index_file(index_name, sha1);
883
- final(pack_name, curr_pack, index_name, curr_index, sha1);
916
+ final(pack_name, curr_pack,
917
+ index_name, curr_index,
918
+ keep_name, keep_msg,
919
+ sha1);
920
free(objects);
921
free(index_name_buf);
922
+ free(keep_name_buf);
923
924
if (!from_stdin)
925
printf("%s\n", sha1_to_hex(sha1));