git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
To: Stefan Beller <sbeller@google.com>
Cc: Junio C Hamano <gitster@pobox.com>, "git\@vger.kernel.org" <git@vger.kernel.org>, Jeff King <peff@peff.net>, Michael Kebe <michael.kebe@gmail.com>, "Liam R . Howlett" <Liam.Howlett@oracle.com>, Adam Dinwoodie <adam@dinwoodie.org>
Subject: Re: [PATCH v3 2/3] sha1dc: optionally use sha1collisiondetection as a submodule
Date: Wed, 05 Jul 2017 20:03:09 +0200
Message-ID: <87bmoybw2q.fsf@gmail.com> (raw)
In-Reply-To: <CAGZ79kaHLi7iotAT-eKkFv5fsG1fTA2k4SYZAPAmU7h3uAA8Jw@mail.gmail.com>


On Wed, Jul 05 2017, Stefan Beller jotted:

> On Tue, Jul 4, 2017 at 6:56 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Stefan Beller <sbeller@google.com> writes:
>>
>>> On Tue, Jul 4, 2017 at 3:50 PM, Ævar Arnfjörð Bjarmason
>>> <avarab@gmail.com> wrote:
>>>
>>>>
>>>> I think some invocation of "git submodule update ???" will do the same,
>>>> but I can't from the docs see what that is right now.
>>>
>>> '--remote' is what you are looking for.
>>>
>>> When we have the branch field configured, the workflow for *creating*
>>> the patch sent
>>> to Junio might be different than it currently is. Currently, you would
>>> send a patch that is
>>> produced as:
>>>
>>>   git -C sha1collisiondetection pull origin master
>>>   git add sha1collisiondetection
>>>   git commit -m "serious reasoning in the commit message"
>>>
>>> This could be 'simplified' to
>>>
>>>   git submodule update --remote
>>>   git add sha1collisiondetection
>>>   git commit -m "serious reasoning in the commit message"
>>>
>>> but as we had different branches in the submodule field,
>>> I wonder how much of an ease this is.
>>>
>>> For Junio the workflow stays the same, as he would just
>>> apply the patch, so I understand why he might see the
>>> branch field as pollution.
>>
>> My reaction was more about "the rest of us", not me or those who
>> choose to bind a new/different commit in the submodule to the
>> superproject.
>
> Currently the rest of us would not care IMHO, as there is no
> difference with the field recorded or not. (I just checked if it
> would provide slight benefits for shallow clones, but not so)
>
>> I was recalling a wish by submodule users in a distant past that
>> lets "submodule update" to detach to the tip of the named branch in
>> the submodule, regardless of what commit the superproject points at
>> with its gitlink.
>
> Yes, I heard that a couple times when poking around for opinions
> and I think the issue has 2 facets:
> * They actually want to be on a branch, such that the workflow
>   is 'normal'. (Whatever that means, "detached HEAD" sounds
>   scary, but workflow-wise it is not. It just requires an additional
>   "checkout -b" once the work done seems worth preserving)
> * None of the people I talked to wanted to get rid of exact-tracking,
>   solely. But they always came in trade off with the first point
>   outweighing the benefits of exact tracking.
>   Although for this purpose the "update --remote" also doesn't
>   quite fit as it does not re-attach the HEAD to a branch at
>   the same commit as the remote tracking branch.

For my submodule use, I'd like to have it checkout the branchname
recorded in the .gitmodules with tracking info set to upstream, and then
"git reset --hard" to the commit that's recorded in the commit info.

This would exactly mirror the state the repo was in when I initally ran
"git submodule add" on it, and make it easy to start making new commits
on my local branch, submit a PR of those to upstream, and have things
like "git fetch && git log @{u}.." work.

>> When those merely following along with this project did "pull &&
>> submodule update", I do not want the submodule directory to check
>> out the commit that happens to be at the tip of their 'master'
>> branch.  If "submodule update" requires an explicit "--remote"
>> option to work in that way, then my worry is allayed, greatly.
>>
>> Thanks.

  reply index

Thread overview: 59+ messages in thread (expand / mbox.gz / Atom feed / [top])
2017-06-26  7:32 Compile Error v2.13.2 on Solaris SPARC Michael Kebe
     [not found] ` <87lgofcf7r.fsf@gmail.com>
2017-06-26 12:36   ` Michael Kebe
2017-06-26 12:47     ` Ævar Arnfjörð Bjarmason
2017-06-26 14:00       ` Michael Kebe
2017-06-26 18:31         ` Ævar Arnfjörð Bjarmason
2017-06-26 18:29       ` Liam R. Howlett
     [not found] ` <87fuem7aw2.fsf@gmail.com>
2017-06-27  5:41   ` Michael Kebe
2017-06-27  6:28     ` Michael Kebe
2017-06-27 16:28       ` Liam R. Howlett
2017-06-27 17:38         ` Junio C Hamano
2017-06-27 18:29           ` Liam R. Howlett
2017-06-27 18:55             ` Ævar Arnfjörð Bjarmason
2017-06-27 17:59         ` Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 0/3] update sha1dc from PR #36 Ævar Arnfjörð Bjarmason
2017-06-27 18:37   ` Stefan Beller
2017-06-27 20:33   ` [PATCH v2 " Ævar Arnfjörð Bjarmason
2017-06-27 21:37     ` Junio C Hamano
2017-06-27 21:38     ` Junio C Hamano
2017-06-27 22:24       ` Ævar Arnfjörð Bjarmason
2017-06-28 21:42       ` Ævar Arnfjörð Bjarmason
2017-06-28 22:02         ` Junio C Hamano
2017-06-27 20:33   ` [PATCH v2 1/3] sha1dc: correct endian detection for Solaris (and others?) Ævar Arnfjörð Bjarmason
2017-06-27 20:33   ` [PATCH v2 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-06-27 20:33   ` [PATCH v2 3/3] sha1collisiondetection: automatically enable when submodule is populated Ævar Arnfjörð Bjarmason
2017-07-01 22:05   ` [PATCH v3 0/3] Update sha1dc from upstream Ævar Arnfjörð Bjarmason
2017-07-01 22:05   ` [PATCH v3 1/3] sha1dc: update " Ævar Arnfjörð Bjarmason
2017-07-01 22:05   ` [PATCH v3 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-07-03 17:11     ` Junio C Hamano
2017-07-03 20:29       ` Ævar Arnfjörð Bjarmason
2017-07-04 17:26         ` Junio C Hamano
2017-07-04 22:50           ` Ævar Arnfjörð Bjarmason
2017-07-05  0:36             ` Stefan Beller
2017-07-05  1:56               ` Junio C Hamano
2017-07-05 17:46                 ` Stefan Beller
2017-07-05 18:03                   ` Ævar Arnfjörð Bjarmason [this message]
2017-07-01 22:05   ` [PATCH v3 3/3] sha1collisiondetection: automatically enable when submodule is populated Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 1/3] sha1dc: update from my PR #36 Ævar Arnfjörð Bjarmason
2017-06-27 15:22   ` Junio C Hamano
2017-06-27 15:53     ` Junio C Hamano
2017-06-27 18:07       ` Ævar Arnfjörð Bjarmason
2017-06-27 15:55     ` Junio C Hamano
2017-06-27 16:31       ` Liam R. Howlett
2017-06-27 18:11       ` Ævar Arnfjörð Bjarmason
2017-06-27 19:10         ` Junio C Hamano
2017-06-27 19:33           ` Junio C Hamano
2017-06-27 19:35           ` Ævar Arnfjörð Bjarmason
2017-06-27 19:38             ` Junio C Hamano
2017-06-27 19:38           ` Liam R. Howlett
2017-06-27 19:48             ` Junio C Hamano
2017-06-27 18:06     ` Ævar Arnfjörð Bjarmason
2017-06-27 18:12       ` Junio C Hamano
2017-06-27 18:19         ` Ævar Arnfjörð Bjarmason
2017-06-27 20:17           ` Junio C Hamano
2017-06-27 18:23       ` Junio C Hamano
2017-06-27 18:52         ` Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule Ævar Arnfjörð Bjarmason
2017-06-27 18:46   ` Stefan Beller
2017-06-27 18:56     ` Ævar Arnfjörð Bjarmason
2017-06-27 12:17 ` [PATCH 3/3] sha1collisiondetection: automatically enable when submodule is populated Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publically 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 to all the recipients using the --to, --cc,
  and --in-reply-to switches of git-send-email(1):

  git send-email \
    --in-reply-to=87bmoybw2q.fsf@gmail.com \
    --to=avarab@gmail.com \
    --cc=Liam.Howlett@oracle.com \
    --cc=adam@dinwoodie.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=michael.kebe@gmail.com \
    --cc=peff@peff.net \
    --cc=sbeller@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

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox