From: Stefan Beller <firstname.lastname@example.org> To: Junio C Hamano <email@example.com> Cc: "firstname.lastname@example.org" <email@example.com> Subject: Re: What's cooking in git.git (Jul 2017, #01; Wed, 5) Date: Mon, 10 Jul 2017 10:27:46 -0700 Message-ID: <CAGZ79kZMC4DcnF-6nT49uZT8NtiWWkKyUm44BHRBPt98idj_Pw@mail.gmail.com> (raw) In-Reply-To: <firstname.lastname@example.org> On Thu, Jul 6, 2017 at 7:13 PM, Junio C Hamano <email@example.com> wrote: > Stefan Beller <firstname.lastname@example.org> writes: > >> Speaking of submodules, It's not just features, but I also send bug fixes. ;) >> https://email@example.com/ >> (That patch is not related to this series, except for working in the submodule >> area, but I consider that patch more important than e.g. this series.) > > I did not see the patch as fixing a bug, though. > > I do agree that overwriting the branch tips in the submodule > repositories, possibly rewinding and discarding user's work done on > the local branches, is indeed a problem. It however is unclear why > detaching HEAD is a good solution to solve that problem. I am not saying detaching a HEAD is a good solution, but I am saying it is a better solution than corrupting the submodule branch, such that commits are lost in the submodule, only to be recorvered via the reflog. > After all, there must have been a reason why the user had checked > out a branch and had pointed it at a specific commit (presumably, > so that further work would be done while on the branch, to make it > easier and safer to eventually push the result back to the upstream > of the submodule's project). So another solution that seems equally > viable, if not even more so, could be to fail the recursive checkout > saying why the checkout cannot be done, just like we fail a checkout > when a local change interferes with updating the contents in the > working tree and the index with an error message explaining which > paths are problematic. That seems like a better model to me for now. > I am *not* saying which one among the above two is better; I am not > even saying that there could be only these two possible solutions. > I just found the posted patch unsatisfactory because it did not make > it clear why the chosen solution is a good one. ok. My long term plan is to introduce another type of symbolic ref, which references a gitlink in another repository, such that the submodule can have a clear distinction between "follows the superproject", "has its own authoritative branch" and "its detached HEAD can mean anything, e.g. historical submodule behavior" > Perhaps I misread the description; but that would mean the > description was prone to be misread and has room for improvement ;-) ok.
next prev parent reply index Thread overview: 11+ messages in thread (expand / mbox.gz / Atom feed / [top]) 2017-07-05 22:35 Junio C Hamano 2017-07-05 23:06 ` Stefan Beller 2017-07-07 2:13 ` Junio C Hamano 2017-07-10 17:27 ` Stefan Beller [this message] 2017-07-05 23:14 ` [PATCH v2 0/3] branch: add a --copy to go with --move Ævar Arnfjörð Bjarmason 2017-07-06 0:37 ` Junio C Hamano 2017-09-22 4:57 ` [PATCH 4/3] branch: fix "copy" to never touch HEAD Junio C Hamano 2017-09-22 16:33 ` Brandon Williams 2017-07-05 23:14 ` [PATCH v2 1/3] config: create a function to format section headers Ævar Arnfjörð Bjarmason 2017-07-05 23:14 ` [PATCH v2 2/3] branch: add test for -m renaming multiple config sections Ævar Arnfjörð Bjarmason 2017-07-05 23:14 ` [PATCH v2 3/3] branch: add a --copy (-c) option to go with --move (-m) Æ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=CAGZ79kZMC4DcnF-6nT49uZT8NtiWWkKyUm44BHRBPt98idj_Pw@mail.gmail.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ /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
email@example.com 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