git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Sam McKelvie <sammck@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] submodule: Alllow staged changes for get_superproject_working_tree
Date: Fri, 28 Sep 2018 15:25:51 -0700	[thread overview]
Message-ID: <xmqqh8i99s40.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <2A26D56C-59E6-4F69-B0CA-4849EBE7EBC9@gmail.com> (Sam McKelvie's message of "Fri, 28 Sep 2018 14:59:15 -0700")

Sam McKelvie <sammck@gmail.com> writes:

>> Or perhaps
>> 
>> rev-parse: --show-superproject-working-tree should work during a merge
>> 
>> may be more to the point.  It does not hint the root cause of the
>> bug like the other one, but is more direct how the breakage would
>> have been observed by the end users.
>> 
> Haha, that is closer to my original title that Stefan wanted to change:
>
> submodule.c: Make get_superproject_working_tree() work when superproject has unmerged changes of the submodule reference
>
> Though I could see why mine was too long.
>
> I’m really happy with both your suggestions

I've pushed out with the "rev-parse: ..." as the title.

Thanks for the fix.


      reply	other threads:[~2018-09-28 22:25 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-27 18:10 [PATCH] submodule: Alllow staged changes for get_superproject_working_tree Sam McKelvie
2018-09-27 19:42 ` Stefan Beller
2018-09-27 22:02 ` Junio C Hamano
2018-09-28  0:30   ` Sam McKelvie
2018-09-28  1:43     ` Junio C Hamano
2018-09-28  3:29       ` Sam McKelvie
2018-09-28 18:00         ` Junio C Hamano
2018-09-28 21:59           ` Sam McKelvie
2018-09-28 22:25             ` Junio C Hamano [this message]

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=xmqqh8i99s40.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=sammck@gmail.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).