X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin-pack-refs.c;h=042d2718f904303600a57cfe8b5de83f5c0d34db;hb=c56f243e20ce48ae50caf841ada8435a21c2a8bf;hp=4093973a0517b02dbdffc3a742605d38b2134e85;hpb=12f9b8a3152ff9fa48464187a83f7c6279fe5094;p=git.git

diff --git a/builtin-pack-refs.c b/builtin-pack-refs.c
index 4093973a0..042d2718f 100644
--- a/builtin-pack-refs.c
+++ b/builtin-pack-refs.c
@@ -1,9 +1,8 @@
 #include "cache.h"
 #include "refs.h"
 
-static const char *result_path, *lock_path;
 static const char builtin_pack_refs_usage[] =
-"git-pack-refs [--prune]";
+"git-pack-refs [--all] [--prune]";
 
 struct ref_to_prune {
 	struct ref_to_prune *next;
@@ -13,16 +12,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,
@@ -36,6 +30,8 @@ static int handle_one_ref(const char *path, const unsigned char *sha1,
 {
 	struct pack_refs_cb_data *cb = cb_data;
 
+	if (!cb->all && strncmp(path, "refs/tags/", 10))
+		return 0;
 	/* Do not pack the symbolic refs */
 	if (!(flags & REF_ISSYMREF))
 		fprintf(cb->refs_file, "%s %s\n", sha1_to_hex(sha1), path);
@@ -69,6 +65,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;
@@ -82,30 +80,27 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
 			cbdata.prune = 1;
 			continue;
 		}
+		if (!strcmp(arg, "--all")) {
+			cbdata.all = 1;
+			continue;
+		}
 		/* perhaps other parameters later... */
 		break;
 	}
 	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));
 	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;