From: Thomas Rast <tr@thomasrast.ch>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: git discussion list <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 0/3] merge -Xindex-only
Date: Sat, 26 Oct 2013 16:40:22 +0200 [thread overview]
Message-ID: <87ob6cm6y1.fsf@linux-k42r.v.cablecom.net> (raw)
In-Reply-To: <87wqozbj0d.fsf@hexa.v.cablecom.net> (Thomas Rast's message of "Tue, 9 Jul 2013 22:01:06 +0200")
Thomas Rast <trast@inf.ethz.ch> writes:
> Michael Haggerty <mhagger@alum.mit.edu> writes:
>
> On IRC you said you would like a version that always acts as
> --no-commit, and simply returns the conflict/no conflict bit as usual.
> The caller would then proceed using commit-tree itself. I think that is
> probably a saner solution than this "output ref" idea.
I just had a huge facepalm moment. We already have this option. It is
called git-merge-recursive.
That is,
git merge-recursive $(git merge-base --all HEAD other) -- HEAD other
will internally do all the work that 'git merge other' would do, but not
update any refs. With this series, you can therefore say
git merge-recursive --index-only $(git merge-base --all HEAD other) -- HEAD other
and get an *index-only* merge of HEAD and other.
Can you see if this is enough to build git-imerge on top of it?
Otherwise I'm glad to help with building the git-merge infrastucture to
support it.
I'll send v2 of the series in a minute; the only change is that I
changed the internal flag semantics as per Junio's comment in
http://thread.gmane.org/gmane.comp.version-control.git/229787/focus=229797
--
Thomas Rast
tr@thomasrast.ch
next prev parent reply other threads:[~2013-10-26 14:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-07 18:02 [PATCH 0/3] merge -Xindex-only Thomas Rast
2013-07-07 18:02 ` [PATCH 1/3] merge-recursive: remove dead conditional in update_stages() Thomas Rast
2013-07-07 18:02 ` [PATCH 2/3] merge-recursive: untangle double meaning of o->call_depth Thomas Rast
2013-07-07 18:37 ` Junio C Hamano
2013-07-07 18:02 ` [PATCH 3/3] merge-recursive: -Xindex-only to leave worktree unchanged Thomas Rast
2013-07-08 15:21 ` [PATCH 0/3] merge -Xindex-only Michael Haggerty
2013-07-08 15:44 ` Thomas Rast
2013-07-09 9:44 ` Michael Haggerty
2013-07-09 12:08 ` Thomas Rast
2013-07-09 19:38 ` Michael Haggerty
2013-07-09 20:01 ` Thomas Rast
2013-10-26 14:40 ` Thomas Rast [this message]
2013-10-26 14:43 ` [PATCH 1/3] merge-recursive: remove dead conditional in update_stages() Thomas Rast
2013-10-26 14:43 ` [PATCH 2/3] merge-recursive: internal flag to avoid touching the worktree Thomas Rast
2013-10-26 14:43 ` [PATCH 3/3] merge-recursive: -Xindex-only to leave worktree unchanged Thomas Rast
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=87ob6cm6y1.fsf@linux-k42r.v.cablecom.net \
--to=tr@thomasrast.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
/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).