From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>
Subject: [PATCH 0/3] cloning unborn HEAD when other branches are present
Date: Wed, 6 Jul 2022 03:57:50 -0400 [thread overview]
Message-ID: <YsVAfudoUA5YkQWH@coredump.intra.peff.net> (raw)
I ran across a situation today where I was being a little clever with
manipulating branches, and the results were confusing. Basically I have
an old bare server-side repo with a "master" branch, and realized that I
wanted to start a new line of history, but save the old one for
historical purposes. So I did this in the bare repo:
cd bare.git
git branch -m master old-history
git symbolic-ref HEAD new-history
to move the old one and point HEAD at the new unborn branch. Note that I
didn't just name it "master"; now that there are two lines of history, I
gave them identifiable and distinct names.
My intent was to then clone and create the new history:
git clone bare.git local-repo
cd local-repo
git commit [etc]
git push
I assumed that just like in the empty-repo case, the clone would start
on "new-history". But it doesn't! This series fixes it.
+cc Jonathan Tan. Definitely not your bug, as the behavior has been this
way forever. But this is very adjacent to your empty-repo unborn head
work from 4f37d45706 (clone: respect remote unborn HEAD, 2021-02-05),
and I think harmonizing a related case.
[1/3]: clone: drop extra newline from warning message
[2/3]: clone: factor out unborn head setup into its own function
[3/3]: clone: propagate empty remote HEAD even with other branches
builtin/clone.c | 49 ++++++++++++++++++++++++------------------
t/t5702-protocol-v2.sh | 38 ++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 21 deletions(-)
-Peff
next reply other threads:[~2022-07-06 8:00 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-06 7:57 Jeff King [this message]
2022-07-06 8:00 ` [PATCH 1/3] clone: drop extra newline from warning message Jeff King
2022-07-06 8:00 ` [PATCH 2/3] clone: factor out unborn head setup into its own function Jeff King
2022-07-06 8:03 ` [PATCH 3/3] clone: propagate empty remote HEAD even with other branches Jeff King
2022-07-06 18:19 ` Junio C Hamano
2022-07-06 22:01 ` Junio C Hamano
2022-07-07 17:40 ` Jeff King
2022-07-07 18:50 ` Junio C Hamano
2022-07-07 23:54 ` [PATCH v2 0/3] cloning unborn HEAD when other branches are present Jeff King
2022-07-07 23:54 ` [PATCH v2 1/3] clone: drop extra newline from warning message Jeff King
2022-07-07 23:57 ` [PATCH v2 2/3] clone: propagate empty remote HEAD even with other branches Jeff King
2022-07-08 15:41 ` Junio C Hamano
2022-07-08 16:08 ` Jeff King
2022-07-07 23:59 ` [PATCH v2 3/3] clone: use remote branch if it matches default HEAD Jeff King
2022-07-08 16:28 ` Junio C Hamano
2022-07-08 19:30 ` Jeff King
2022-07-08 20:33 ` Junio C Hamano
2022-07-11 9:21 ` [PATCH v2 4/3] clone: move unborn head creation to update_head() Jeff King
2022-07-11 20:36 ` Junio C Hamano
2022-07-07 17:23 ` [PATCH 3/3] clone: propagate empty remote HEAD even with other branches Jeff King
2022-07-06 18:17 ` [PATCH 0/3] cloning unborn HEAD when other branches are present Jonathan Tan
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=YsVAfudoUA5YkQWH@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@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).