Revert "Allow branch.*.merge to talk about remote tracking branches."

diff --git a/builtin-pack-refs.c b/builtin-pack-refs.c
index 4093973a0517b02dbdffc3a742605d38b2134e85..3de9b3eefdaad43f0b0212b93055f26a9542533a 100644 (file)
--- a/builtin-pack-refs.c
+++ b/builtin-pack-refs.c
@@ -1,9 +1,10 @@
 #include "cache.h"
 #include "refs.h"
+#include "object.h"
+#include "tag.h"
 
-static const char *result_path, *lock_path;
 static const char builtin_pack_refs_usage[] =
-"git-pack-refs [--prune]";
+"git-pack-refs [--all] [--prune | --no-prune]";
 
 struct ref_to_prune {
        struct ref_to_prune *next;
@@ -13,16 +14,11 @@ struct ref_to_prune {
 
 struct pack_refs_cb_data {
        int prune;
+       int all;
        struct ref_to_prune *ref_to_prune;
        FILE *refs_file;
 };
 
-static void remove_lock_file(void)
-{
-       if (lock_path)
-               unlink(lock_path);
-}
-
 static int do_not_prune(int flags)
 {
        /* If it is already packed or if it is a symref,
@@ -35,10 +31,28 @@ static int handle_one_ref(const char *path, const unsigned char *sha1,
                          int flags, void *cb_data)
 {
        struct pack_refs_cb_data *cb = cb_data;
+       int is_tag_ref;
 
        /* Do not pack the symbolic refs */
-       if (!(flags & REF_ISSYMREF))
-               fprintf(cb->refs_file, "%s %s\n", sha1_to_hex(sha1), path);
+       if ((flags & REF_ISSYMREF))
+               return 0;
+       is_tag_ref = !strncmp(path, "refs/tags/", 10);
+
+       /* ALWAYS pack refs that were already packed or are tags */
+       if (!cb->all && !is_tag_ref && !(flags & REF_ISPACKED))
+               return 0;
+
+       fprintf(cb->refs_file, "%s %s\n", sha1_to_hex(sha1), path);
+       if (is_tag_ref) {
+               struct object *o = parse_object(sha1);
+               if (o->type == OBJ_TAG) {
+                       o = deref_tag(o, path, 0);
+                       if (o)
+                               fprintf(cb->refs_file, "^%s\n",
+                                       sha1_to_hex(o->sha1));
+               }
+       }
+
        if (cb->prune && !do_not_prune(flags)) {
                int namelen = strlen(path) + 1;
                struct ref_to_prune *n = xcalloc(1, sizeof(*n) + namelen);
@@ -69,6 +83,8 @@ static void prune_refs(struct ref_to_prune *r)
        }
 }
 
+static struct lock_file packed;
+
 int cmd_pack_refs(int argc, const char **argv, const char *prefix)
 {
        int fd, i;
@@ -76,10 +92,19 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
 
        memset(&cbdata, 0, sizeof(cbdata));
 
+       cbdata.prune = 1;
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
                if (!strcmp(arg, "--prune")) {
-                       cbdata.prune = 1;
+                       cbdata.prune = 1; /* now the default */
+                       continue;
+               }
+               if (!strcmp(arg, "--no-prune")) {
+                       cbdata.prune = 0;
+                       continue;
+               }
+               if (!strcmp(arg, "--all")) {
+                       cbdata.all = 1;
                        continue;
                }
                /* perhaps other parameters later... */
@@ -88,24 +113,21 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
        if (i != argc)
                usage(builtin_pack_refs_usage);
 
-       result_path = xstrdup(git_path("packed-refs"));
-       lock_path = xstrdup(mkpath("%s.lock", result_path));
-
-       fd = open(lock_path, O_CREAT | O_EXCL | O_WRONLY, 0666);
-       if (fd < 0)
-               die("unable to create new ref-pack file (%s)", strerror(errno));
-       atexit(remove_lock_file);
-
+       fd = hold_lock_file_for_update(&packed, git_path("packed-refs"), 1);
        cbdata.refs_file = fdopen(fd, "w");
        if (!cbdata.refs_file)
                die("unable to create ref-pack file structure (%s)",
                    strerror(errno));
+
+       /* perhaps other traits later as well */
+       fprintf(cbdata.refs_file, "# pack-refs with: peeled \n");
+
        for_each_ref(handle_one_ref, &cbdata);
+       fflush(cbdata.refs_file);
        fsync(fd);
        fclose(cbdata.refs_file);
-       if (rename(lock_path, result_path) < 0)
+       if (commit_lock_file(&packed) < 0)
                die("unable to overwrite old ref-pack file (%s)", strerror(errno));
-       lock_path = NULL;
        if (cbdata.prune)
                prune_refs(cbdata.ref_to_prune);
        return 0;