From: Duy Nguyen <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Ronnie Sahlberg <sahlberg@google.com>,
Git Mailing List <git@vger.kernel.org>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: What's cooking in git.git (Sep 2014, #01; Tue, 2)
Date: Fri, 5 Sep 2014 08:18:34 +0700 [thread overview]
Message-ID: <CACsJy8AyrGeLJ-B+81ZNQaKGvNV5YNnZ_RWUumvhKR-tvTrg9A@mail.gmail.com> (raw)
In-Reply-To: <xmqqmwafux3y.fsf@gitster.dls.corp.google.com>
On Fri, Sep 5, 2014 at 12:14 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Duy Nguyen <pclouds@gmail.com> writes:
>>
>>> On Wed, Sep 3, 2014 at 5:06 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>>> * nd/multiple-work-trees (2014-07-29) 39 commits
>>>>
>>>> Reroll posted, but haven't picked up yet. How would this interact
>>>> with rr/transaction series which is pretty much all about the refs?
>>>
>>> Haven't checked out that topic yet. But ref changes in
>>> multiple-work-trees are to make sure ref path construction goess
>>> through git_path(), and some cleaning up after strbuf_git_path() is
>>> introduced. So basically textual conflicts only.
>>
>> Up to the point that is queued on 'pu', the other topic(s) still
>> keep the assumption that all refs are files in $GIT_DIR/refs/, and I
>> think I managed the textual conflicts correctly in 'pu' before.
>
> One point that caused unnecessary conflict resolution was that the
> transaction series lacked "let's use strbuf to hold paths". This
> had two immediate side effects, i.e. "instead of returning upon
> errors, jump to the end with 'goto done/fail' for necessary
> clean-up" and "get rid of git_snpath and use strbuf_git_path", both
> of which are good general clean-ups, even if they weren't related to
> the multiple worktrees feature, that conflicted with the transaction
> series when getting merged.
>
> You can see the interactions by checking
>
> $ git show 'pu^{/^Merge branch .nd/multi}' refs.c
>
> Perhaps these three changes, without the addition of the multiple
> worktree feature, should come first as a general clean-up on top of
> which both topics can be built?
If that makes your life easier, sure. Changes up until (and including)
c88c438 (setup.c: convert is_git_directory() to use strbuf -
2014-08-30) could be considered cleanups. After that commit, refs.c is
not touched. Will look at your conflict resultion later..
--
Duy
next prev parent reply other threads:[~2014-09-05 1:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-02 22:06 What's cooking in git.git (Sep 2014, #01; Tue, 2) Junio C Hamano
2014-09-03 6:27 ` Johannes Sixt
2014-09-03 18:45 ` Torsten Bögershausen
2014-09-03 19:18 ` Junio C Hamano
2014-09-03 19:30 ` Keller, Jacob E
2014-09-04 13:46 ` Duy Nguyen
2014-09-04 16:51 ` Junio C Hamano
2014-09-04 17:14 ` Junio C Hamano
2014-09-04 17:25 ` Junio C Hamano
2014-09-05 1:18 ` Duy Nguyen [this message]
2014-09-05 0:47 ` Duy Nguyen
2015-03-26 13:46 ` Tommy38
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=CACsJy8AyrGeLJ-B+81ZNQaKGvNV5YNnZ_RWUumvhKR-tvTrg9A@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sahlberg@google.com \
/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).