From: Kyle Meyer <kyle@kyleam.com>
To: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 3/3] rename_ref: replace empty deletion message in HEAD's log
Date: Fri, 17 Feb 2017 18:42:20 -0500 [thread overview]
Message-ID: <87zihkpeoz.fsf@kyleam.com> (raw)
In-Reply-To: <20170217195549.z6uyy7hbbhj5avh7@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> On Fri, Feb 17, 2017 at 02:43:50PM -0500, Jeff King wrote:
>
>> Yes. I think the options are basically (in order of decreasing
>> preference in my opinion):
>>
>> 1. Log a rename entry (same sha1, but note the rename in the free-form
>> text).
>>
>> 2. Log a delete (sha1 goes to null) followed by a creation (from null
>> back to the original sha1).
>>
>> 3. Log nothing at all for HEAD.
>>
>> This does half of (2). If we do the second half, then I'd prefer it to
>> (3). But if we can do (1), that is better still (IMHO).
[...]
>> I'm actually confused about which bit of code is updating HEAD. I do not
>> see it either in files_rename_ref() or in the caller. Yet it clearly
>> happens. But that is the code that would know enough to do (1) or the
>> second half of (2) above.
>
> Ah, I found it. It's in replace_each_worktree_head_symref() these days,
> which does not bother to pass a log message.
>
> So I think the second half of (2) is probably something like the patch
> below.
>
> Thinking on it more, we probably _do_ want two entries. Because the
> operations are not atomic, it's possible that we may end up in a
> half-way state after the first entry is written. And when debugging such
> a case, I'd much rather see the first half of the operation logged than
> nothing at all.
OK, I'll have a go at replacing patch 3 with this approach.
--
Kyle
next prev parent reply other threads:[~2017-02-17 23:42 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-16 23:17 HEAD's reflog entry for a renamed branch Kyle Meyer
2017-01-26 21:12 ` Jeff King
2017-01-26 21:30 ` Junio C Hamano
2017-01-26 21:53 ` Jeff King
2017-02-17 3:57 ` [PATCH 0/3] delete_ref(): support reflog messages Kyle Meyer
2017-02-17 3:57 ` [PATCH 1/3] delete_refs(): accept a reflog message argument Kyle Meyer
2017-02-17 8:12 ` Jeff King
2017-02-17 17:05 ` Junio C Hamano
2017-02-17 23:35 ` Kyle Meyer
2017-02-17 3:57 ` [PATCH 2/3] update-ref: pass reflog message argument to delete_refs Kyle Meyer
2017-02-17 8:22 ` Jeff King
2017-02-17 17:11 ` Junio C Hamano
2017-02-17 23:40 ` Kyle Meyer
2017-02-17 23:41 ` Jeff King
2017-02-17 3:58 ` [PATCH 3/3] rename_ref: replace empty deletion message in HEAD's log Kyle Meyer
2017-02-17 8:31 ` Jeff King
2017-02-17 17:50 ` Junio C Hamano
2017-02-17 19:43 ` Jeff King
2017-02-17 19:55 ` Jeff King
2017-02-17 22:18 ` Junio C Hamano
2017-02-17 23:42 ` Kyle Meyer [this message]
2017-02-17 23:41 ` Kyle Meyer
2017-02-17 23:53 ` Junio C Hamano
2017-02-17 23:53 ` Jeff King
2017-02-17 8:17 ` [PATCH 0/3] delete_ref(): support reflog messages Jeff King
2017-02-21 1:10 ` [PATCH v2 0/4] delete_ref: " Kyle Meyer
2017-02-21 1:10 ` [PATCH v2 1/4] delete_ref: accept a reflog message argument Kyle Meyer
2017-02-23 9:33 ` Duy Nguyen
2017-02-23 22:29 ` Junio C Hamano
2017-02-25 3:05 ` Kyle Meyer
2017-02-21 1:10 ` [PATCH v2 2/4] update-ref: pass reflog message to delete_ref() Kyle Meyer
2017-02-21 1:10 ` [PATCH v2 3/4] rename_ref: replace empty message in HEAD's log Kyle Meyer
2017-02-21 1:10 ` [PATCH v2 4/4] branch: record creation of renamed branch " Kyle Meyer
2017-02-21 7:12 ` [PATCH v2 0/4] delete_ref: support reflog messages Jeff King
2017-02-21 7:18 ` Junio C Hamano
2017-02-21 16:45 ` Kyle Meyer
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zihkpeoz.fsf@kyleam.com \
--to=kyle@kyleam.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).