diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2007-01-25 16:51:21 -0800 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-01-25 19:16:07 -0800 |
| commit | 1b555932cdb7f75239623573cd2ff25fa98ab4e4 (patch) | |
| tree | 3cd342e77ecef95266e8bba684b5931ffbe9cd29 | |
| parent | New files in git weren't being downloaded during CVS update (diff) | |
| download | tgif-1b555932cdb7f75239623573cd2ff25fa98ab4e4.tar.xz | |
Fix seriously broken "git pack-refs"
Do *NOT* try this on a repository you care about:
git pack-refs --all --prune
git pack-refs
because while the first "pack-refs" does the right thing, the second
pack-refs will totally screw you over.
This is because the second one tries to pack only tags; we should
also pack what are already packed -- otherwise we would lose them.
[jc: with an additional test]
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-pack-refs.c | 4 | ||||
| -rwxr-xr-x | t/t3210-pack-refs.sh | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/builtin-pack-refs.c b/builtin-pack-refs.c index 6de7128b9d..3de9b3eefd 100644 --- a/builtin-pack-refs.c +++ b/builtin-pack-refs.c @@ -37,7 +37,9 @@ static int handle_one_ref(const char *path, const unsigned char *sha1, if ((flags & REF_ISSYMREF)) return 0; is_tag_ref = !strncmp(path, "refs/tags/", 10); - if (!cb->all && !is_tag_ref) + + /* ALWAYS pack refs that were already packed or are tags */ + if (!cb->all && !is_tag_ref && !(flags & REF_ISPACKED)) return 0; fprintf(cb->refs_file, "%s %s\n", sha1_to_hex(sha1), path); diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh index 16bdae4f23..f0c7e22b36 100755 --- a/t/t3210-pack-refs.sh +++ b/t/t3210-pack-refs.sh @@ -96,4 +96,13 @@ test_expect_success \ git-branch -d n/o/p && git-branch n' +test_expect_success 'pack, prune and repack' ' + git-tag foo && + git-pack-refs --all --prune && + git-show-ref >all-of-them && + git-pack-refs && + git-show-ref >again && + diff all-of-them again +' + test_done |