X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-pack-refs.c;h=1923fb1914c910457d2a987d73915db365fef68d;hb=faf8280850e9af4ef63decd8d4e65a7609544c21;hp=1952950c9a4bf13dc728bb8d6a79493dad36df06;hpb=68fb4650497d6acbf6d407513cd2e2d960442e3b;p=git.git

diff --git a/builtin-pack-refs.c b/builtin-pack-refs.c
index 1952950c9..1923fb191 100644
--- a/builtin-pack-refs.c
+++ b/builtin-pack-refs.c
@@ -1,10 +1,9 @@
+#include "builtin.h"
 #include "cache.h"
 #include "refs.h"
 #include "object.h"
 #include "tag.h"
-
-static const char builtin_pack_refs_usage[] =
-"git-pack-refs [--all] [--prune | --no-prune]";
+#include "parse-options.h"
 
 struct ref_to_prune {
 	struct ref_to_prune *next;
@@ -105,6 +104,8 @@ static int pack_refs(unsigned int flags)
 	fprintf(cbdata.refs_file, "# pack-refs with: peeled \n");
 
 	for_each_ref(handle_one_ref, &cbdata);
+	if (ferror(cbdata.refs_file))
+		die("failed to write ref-pack file");
 	if (fflush(cbdata.refs_file) || fsync(fd) || fclose(cbdata.refs_file))
 		die("failed to write ref-pack file (%s)", strerror(errno));
 	if (commit_lock_file(&packed) < 0)
@@ -114,31 +115,20 @@ static int pack_refs(unsigned int flags)
 	return 0;
 }
 
+static char const * const pack_refs_usage[] = {
+	"git-pack-refs [options]",
+	NULL
+};
+
 int cmd_pack_refs(int argc, const char **argv, const char *prefix)
 {
-	int i;
-	unsigned int flags;
-
-	flags = PACK_REFS_PRUNE;
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
-		if (!strcmp(arg, "--prune")) {
-			flags |= PACK_REFS_PRUNE; /* now the default */
-			continue;
-		}
-		if (!strcmp(arg, "--no-prune")) {
-			flags &= ~PACK_REFS_PRUNE;
-			continue;
-		}
-		if (!strcmp(arg, "--all")) {
-			flags |= PACK_REFS_ALL;
-			continue;
-		}
-		/* perhaps other parameters later... */
-		break;
-	}
-	if (i != argc)
-		usage(builtin_pack_refs_usage);
-
+	unsigned int flags = PACK_REFS_PRUNE;
+	struct option opts[] = {
+		OPT_BIT(0, "all",   &flags, "pack everything", PACK_REFS_ALL),
+		OPT_BIT(0, "prune", &flags, "prune loose refs (default)", PACK_REFS_PRUNE),
+		OPT_END(),
+	};
+	if (parse_options(argc, argv, opts, pack_refs_usage, 0))
+		usage_with_options(pack_refs_usage, opts);
 	return pack_refs(flags);
 }