[RFC 3/3] Change naming convention for the reflog graveyard
- From
mhagger@alum.mit.edu <mhagger@alum.mit.edu>
- Date
- Aug 18, 2012, 17:14 UTC
- Message-ID
- <1345310086-20089-4-git-send-email-mhagger@alum.mit.edu>
- In-Reply-To
- <1345310086-20089-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>
Store reflogs for dead references among those for live references, in a scheme that could in the future be extended to prevent file/directory conflicts for live reference names, as well. Store the reflog for a dead reference "refs/foo/bar/baz" in file "$GIT_DIR/logs/refs~d/heads~d/foo~d/bar~d/baz~f", where the suffix "~d" is appended to "directory" names and "~f" is append to "file" names.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> --- refs.c | 31 ++++++++++++++++++++++++------- t/t7701-repack-unpack-unreachable.sh | 4 ++-- t/t9300-fast-import.sh | 2 +- 3 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/refs.c b/refs.c index 551a0f9..4797b20 100644 --- a/refs.c +++ b/refs.c @@ -2580,20 +2580,37 @@ char *shorten_unambiguous_ref(const char *refname, int strict) char *refname_to_graveyard_reflog(const char *ref) { - return git_path("logs/graveyard/%s~", ref); + static struct strbuf buf = STRBUF_INIT; + + const char *p, *slash; + strbuf_reset(&buf); + for (p = ref; (slash = strchr(p, '/')); p = slash + 1) { + strbuf_add(&buf, p, slash - p); + strbuf_addstr(&buf, "~d/"); + } + strbuf_addstr(&buf, p); + strbuf_addstr(&buf, "~f"); + + return git_path("logs/%s", buf.buf); } char *graveyard_reflog_to_refname(const char *log) { static struct strbuf buf = STRBUF_INIT; - if (!prefixcmp(log, "graveyard/")) - log += 10; - + const char *p, *slash; strbuf_reset(&buf); - strbuf_addstr(&buf, log); - if (buf.len > 0 && buf.buf[buf.len-1] == '~') - strbuf_setlen(&buf, buf.len - 1); + for (p = log; (slash = strchr(p, '/')); p = slash + 1) { + if (slash - p > 2 && slash[-2] == '~' && slash[-1] == 'd') + strbuf_add(&buf, p, slash - p - 2); + else + strbuf_add(&buf, p, slash - p); + strbuf_addch(&buf, '/'); + } + + strbuf_addstr(&buf, p); + if (buf.len > 2 && !strcmp(buf.buf + buf.len - 2, "~f")) + strbuf_setlen(&buf, buf.len - 2); return buf.buf; } diff --git a/t/t7701-repack-unpack-unreachable.sh b/t/t7701-repack-unpack-unreachable.sh index c06b715..f8d02db 100755 --- a/t/t7701-repack-unpack-unreachable.sh +++ b/t/t7701-repack-unpack-unreachable.sh @@ -40,7 +40,7 @@ test_expect_success '-A with -d option leaves unreachable objects unpacked' ' # now expire the reflog, while keeping reachable ones but expiring # unreachables immediately; also remove any graveyard reflogs # from deleted branches that would keep things reachable - rm -rf .git/logs/graveyard && + rm -rf .git/logs/*~? && test_tick && sometimeago=$(( $test_tick - 10000 )) && git reflog expire --expire=$sometimeago --expire-unreachable=$test_tick --all && @@ -78,7 +78,7 @@ test_expect_success '-A without -d option leaves unreachable objects packed' ' test 1 = $(ls -1 .git/objects/pack/pack-*.pack | wc -l) && packfile=$(ls .git/objects/pack/pack-*.pack) && git branch -D transient_branch && - rm -rf .git/logs/graveyard && + rm -rf .git/logs/*~? && test_tick && git repack -A -l && test ! -f "$fsha1path" && diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index dc6c67d..8d88f5f 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1700,7 +1700,7 @@ INPUT_END test_expect_success 'P: verbatim SHA gitlinks' ' git branch -D sub && - rm -rf .git/logs/graveyard && + rm -rf .git/logs/*~? && git gc && git prune && git fast-import <input && test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)
-- 1.7.11.3