From: Junio C Hamano <gitster@pobox.com>
To: Robin Rosenberg <robin.rosenberg@dewire.com>
Cc: Sven Strickroth <sven.strickroth@tu-clausthal.de>, git@vger.kernel.org
Subject: Re: RFC: reflog for deleted branches
Date: Fri, 04 May 2012 09:24:51 -0700 [thread overview]
Message-ID: <7vmx5nc3sc.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4FA376B5.50804@dewire.com> (Robin Rosenberg's message of "Fri, 04 May 2012 08:27:01 +0200")
Robin Rosenberg <robin.rosenberg@dewire.com> writes:
> Junio C Hamano skrev 2012-05-04 01.05:
>> Sven Strickroth <sven.strickroth@tu-clausthal.de> writes:
>>
>>> The "normal" reflog cannot be used if you just create and then delete a
>>> branch - the reflog is empty in this case.
>>
>> I somehow thought we discussed about the lack of "creation" event.
>> Perhaps it is sufficient to create a reflog entry for such then?
>
> We have the create event (oldd=0000...), if we just don't delete the log and add
> a destroy event (newid=000000).
>
> A bit trickier with the current reflog design is the case where you
> delete branch foo and then create the branch foo/bar.
That is not worth worrying about from the behavioral point of view, as end
users, even on Macs and Windows, have long learned that in a hierarchical
name space, you cannot have foo and foo/bar at the same time. But from
the implementation point of view, that implies in this sequence:
create foo/bar, creating refs/heads/foo/bar and logs/foo/bar
delete foo/bar, removing refs/heads/foo/bar but keeping logs/foo/bar
create foo
the third step needs to "rm -fr logs/foo && >logs/foo". We have refs/heads/foo
under lock, so presumably nobody can create a baz branch that adds logs/foo/baz
to race with us while we do so, but I didn't check. Our lock taking code
may need to be tweaked so that if you take lock on refs/heads/foo, nobody
else can take lock on refs/heads/foo/anything, and vice versa.
next prev parent reply other threads:[~2012-05-04 16:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-03 21:25 RFC: reflog for deleted branches Sven Strickroth
2012-05-03 21:37 ` Junio C Hamano
2012-05-03 22:10 ` Sven Strickroth
2012-05-03 23:05 ` Junio C Hamano
2012-05-03 23:39 ` Sven Strickroth
2012-05-04 6:27 ` Robin Rosenberg
2012-05-04 16:24 ` Junio C Hamano [this message]
2012-05-03 22:13 ` Andrew Sayers
2012-05-04 1:17 ` Sitaram Chamarty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vmx5nc3sc.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg@dewire.com \
--cc=sven.strickroth@tu-clausthal.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).