diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:03:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:03:38 -0800 |
| commit | afcc4f7767ad8a2daac1c816fad02c890b0d2b99 (patch) | |
| tree | 2b1e6295e1dbabb867efa7364247d4dab1164cfd | |
| parent | c579f537fc911f1eca0c81e259fe547f6cd984ce (diff) | |
| parent | f01913e4190bed98f918ec575229943a0ee47d83 (diff) | |
| download | git-afcc4f7767ad8a2daac1c816fad02c890b0d2b99.tar.gz git-afcc4f7767ad8a2daac1c816fad02c890b0d2b99.tar.xz | |
Merge branch 'js/prune-expire'
* js/prune-expire:
Add "--expire <time>" option to 'git prune'
| -rw-r--r-- | Documentation/git-prune.txt | 5 | ||||
| -rw-r--r-- | builtin-prune.c | 21 | ||||
| -rwxr-xr-x | t/t1410-reflog.sh | 18 |
3 files changed, 42 insertions, 2 deletions
diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt index 0ace233d1..9835bdb87 100644 --- a/Documentation/git-prune.txt +++ b/Documentation/git-prune.txt @@ -8,7 +8,7 @@ git-prune - Prune all unreachable objects from the object database SYNOPSIS -------- -'git-prune' [-n] [--] [<head>...] +'git-prune' [-n] [--expire <expire>] [--] [<head>...] DESCRIPTION ----------- @@ -31,6 +31,9 @@ OPTIONS \--:: Do not interpret any more arguments as options. +\--expire <time>:: + Only expire loose objects older than <time>. + <head>...:: In addition to objects reachable from any of our references, keep objects diff --git a/builtin-prune.c b/builtin-prune.c index 44df59e4a..b5e768421 100644 --- a/builtin-prune.c +++ b/builtin-prune.c @@ -7,15 +7,24 @@ static const char prune_usage[] = "git-prune [-n]"; static int show_only; +static unsigned long expire; static int prune_object(char *path, const char *filename, const unsigned char *sha1) { + const char *fullpath = mkpath("%s/%s", path, filename); + if (expire) { + struct stat st; + if (lstat(fullpath, &st)) + return error("Could not stat '%s'", fullpath); + if (st.st_mtime > expire) + return 0; + } if (show_only) { enum object_type type = sha1_object_info(sha1, NULL); printf("%s %s\n", sha1_to_hex(sha1), (type > 0) ? typename(type) : "unknown"); } else - unlink(mkpath("%s/%s", path, filename)); + unlink(fullpath); return 0; } @@ -85,6 +94,16 @@ int cmd_prune(int argc, const char **argv, const char *prefix) show_only = 1; continue; } + if (!strcmp(arg, "--expire")) { + if (++i < argc) { + expire = approxidate(argv[i]); + continue; + } + } + else if (!prefixcmp(arg, "--expire=")) { + expire = approxidate(arg + 9); + continue; + } usage(prune_usage); } diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index e5bbc384f..f959aae84 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -175,4 +175,22 @@ test_expect_success 'recover and check' ' ' +test_expect_success 'prune --expire' ' + + before=$(git count-objects | sed "s/ .*//") && + BLOB=$(echo aleph | git hash-object -w --stdin) && + BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") && + test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && + test -f $BLOB_FILE && + git reset --hard && + git prune --expire=1.hour.ago && + test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && + test -f $BLOB_FILE && + test-chmtime -86500 $BLOB_FILE && + git prune --expire 1.day && + test $before = $(git count-objects | sed "s/ .*//") && + ! test -f $BLOB_FILE + +' + test_done |