summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-20 04:38:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-20 04:38:36 (GMT)
commit51890a64eb152fb914d0dd3676f549ab8d8cc49a (patch)
treec5b6dd555899bca32f456418a05a236a38502c4f
parent4426ac70a1d15e103bd8a4bd1aa16be16b80c5bc (diff)
downloadgit-51890a64eb152fb914d0dd3676f549ab8d8cc49a.zip
git-51890a64eb152fb914d0dd3676f549ab8d8cc49a.tar.gz
git-51890a64eb152fb914d0dd3676f549ab8d8cc49a.tar.bz2
Call prune-packed from "git prune" as well.
Add -n (dryrun) flag to git-prune-packed, and call it from "git prune". Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-prune-script6
-rw-r--r--prune-packed.c16
2 files changed, 16 insertions, 6 deletions
diff --git a/git-prune-script b/git-prune-script
index a8e338c..2e130c7 100755
--- a/git-prune-script
+++ b/git-prune-script
@@ -3,10 +3,11 @@
. git-sh-setup-script || die "Not a git archive"
dryrun=
+echo=
while case "$#" in 0) break ;; esac
do
case "$1" in
- -n) dryrun=echo ;;
+ -n) dryrun=-n echo=echo ;;
--) break ;;
-*) echo >&2 "usage: git-prune-script [ -n ] [ heads... ]"; exit 1 ;;
*) break ;;
@@ -20,6 +21,7 @@ sed -ne '/unreachable /{
s|\(..\)|\1/|p
}' | {
cd "$GIT_OBJECT_DIRECTORY" || exit
- xargs $dryrun rm -f
+ xargs $echo rm -f
}
+git-prune-packed $dryrun
diff --git a/prune-packed.c b/prune-packed.c
index a2f4488..5306e8e 100644
--- a/prune-packed.c
+++ b/prune-packed.c
@@ -1,6 +1,9 @@
#include "cache.h"
-static const char prune_packed_usage[] = "git-prune-packed (no arguments)";
+static const char prune_packed_usage[] =
+"git-prune-packed [-n]";
+
+static int dryrun;
static void prune_dir(int i, DIR *dir, char *pathname, int len)
{
@@ -18,7 +21,9 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len)
if (!has_sha1_pack(sha1))
continue;
memcpy(pathname + len, de->d_name, 38);
- if (unlink(pathname) < 0)
+ if (dryrun)
+ printf("rm -f %s\n", pathname);
+ else if (unlink(pathname) < 0)
error("unable to unlink %s", pathname);
}
}
@@ -55,8 +60,11 @@ int main(int argc, char **argv)
const char *arg = argv[i];
if (*arg == '-') {
- /* Handle flags here .. */
- usage(prune_packed_usage);
+ if (!strcmp(arg, "-n"))
+ dryrun = 1;
+ else
+ usage(prune_packed_usage);
+ continue;
}
/* Handle arguments here .. */
usage(prune_packed_usage);