Add "--non-empty" flag to git-pack-objects

It skips writing the pack-file if it ends up being empty.

diff --git a/pack-objects.c b/pack-objects.c
index 780418dcec524fa294064e26a8403d4411cced62..9e9c5788fd2770a67af230c3313b6980cb3fa2bd 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -18,6 +18,7 @@ struct object_entry {
        struct object_entry *delta;
 };
 
        struct object_entry *delta;
 };
 

+static int non_empty = 0;

 static int incremental = 0;
 static struct object_entry **sorted_by_sha, **sorted_by_type;
 static struct object_entry *objects = NULL;
 static int incremental = 0;
 static struct object_entry **sorted_by_sha, **sorted_by_type;
 static struct object_entry *objects = NULL;


@@ -391,6 +392,10 @@ int main(int argc, char **argv)
                const char *arg = argv[i];
 
                if (*arg == '-') {
                const char *arg = argv[i];
 
                if (*arg == '-') {

+                       if (!strcmp("--non-empty", arg)) {
+                               non_empty = 1;
+                               continue;
+                       }

                        if (!strcmp("--incremental", arg)) {
                                incremental = 1;
                                continue;
                        if (!strcmp("--incremental", arg)) {
                                incremental = 1;
                                continue;


@@ -440,6 +445,8 @@ int main(int argc, char **argv)
                }
                add_object_entry(sha1, hash);
        }
                }
                add_object_entry(sha1, hash);
        }

+       if (non_empty && !nr_objects)
+               return 0;

        get_object_details();
 
        fprintf(stderr, "Packing %d objects\n", nr_objects);
        get_object_details();
 
        fprintf(stderr, "Packing %d objects\n", nr_objects);