undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call prune-packed from "git prune" as well.

Browse Source 
Add -n (dryrun) flag to git-prune-packed, and call it from "git prune".

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-08-19 21:38:36 -07:00
parent 4426ac70a1
commit 51890a64eb
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-prune-script
View File

@ -3,10 +3,11 @@
. git-sh-setup-script || die "Not a git archive" . git-sh-setup-script || die "Not a git archive"
dryrun= dryrun=
echo=
while case "$#" in 0) break ;; esac while case "$#" in 0) break ;; esac
do do
case "$1" in case "$1" in
-n) dryrun=echo ;; -n) dryrun=-n echo=echo ;;
--) break ;; --) break ;;
-*) echo >&2 "usage: git-prune-script [ -n ] [ heads... ]"; exit 1 ;; -*) echo >&2 "usage: git-prune-script [ -n ] [ heads... ]"; exit 1 ;;
*) break ;; *) break ;;
@ -20,6 +21,7 @@ sed -ne '/unreachable /{
s|\(..\)|\1/|p s|\(..\)|\1/|p
}' | { }' | {
cd "$GIT_OBJECT_DIRECTORY" || exit cd "$GIT_OBJECT_DIRECTORY" || exit
xargs $dryrun rm -f xargs $echo rm -f
} }
git-prune-packed $dryrun

14
prune-packed.c
View File

@ -1,6 +1,9 @@
#include "cache.h" #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) 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)) if (!has_sha1_pack(sha1))
continue; continue;
memcpy(pathname + len, de->d_name, 38); 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); error("unable to unlink %s", pathname);
} }
} }
@ -55,8 +60,11 @@ int main(int argc, char **argv)
const char *arg = argv[i]; const char *arg = argv[i];
if (*arg == '-') { if (*arg == '-') {
/* Handle flags here .. */ if (!strcmp(arg, "-n"))
dryrun = 1;
else
usage(prune_packed_usage); usage(prune_packed_usage);
continue;
} }
/* Handle arguments here .. */ /* Handle arguments here .. */
usage(prune_packed_usage); usage(prune_packed_usage);