From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Sahil Dua" <sahildua2305@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Michael Haggerty" <mhagger@alum.mit.edu>,
"Brandon Williams" <bmwill@google.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 0/3] branch: add a --copy to go with --move
Date: Wed, 5 Jul 2017 23:14:51 +0000 [thread overview]
Message-ID: <20170705231454.15666-1-avarab@gmail.com> (raw)
In-Reply-To: <xmqqeftuh5q7.fsf@gitster.mtv.corp.google.com>
On Wed, Jul 05 2017, Junio C. Hamano jotted:
> * sd/branch-copy (2017-06-18) 3 commits
> - branch: add a --copy (-c) option to go with --move (-m)
> - branch: add test for -m renaming multiple config sections
> - config: create a function to format section headers
>
> "git branch" learned "-c/-C" to create and switch to a new branch
> by copying an existing one.
>
> Has a bit of interaction with mh/packed-ref-store and bw/config-h,
> so perhaps needs to wait for the former to stabilize a bit more
> and possibly rebasing on them.
Now that bw/config-h has landed in master here's a version that's
rebased on that. No changes from v1 except:
- moving the new config header addition from cache.h to config.h,
corresponding to what was done in bw/config-h.
- fixing a trivial comment whitespace issue which I see you applied
locally.
Even though this modifies some of the same files as
mh/packed-ref-store it looks to me like this doesn't conflict with
that topic in any meaningful way, but I may be missing something. I
can't get a merge between this & gitster/mh/packed-ref-store
compiling, but that's due to issues in the latter which seem to be
fixed by some subsequent merge/fixup in pu, not something to do with a
genuine conflict with this topic.
Hopefully this'll allow this topic to land in 2.14.
Sahil Dua (2):
config: create a function to format section headers
branch: add a --copy (-c) option to go with --move (-m)
Ævar Arnfjörð Bjarmason (1):
branch: add test for -m renaming multiple config sections
Documentation/git-branch.txt | 14 ++-
builtin/branch.c | 67 ++++++++---
config.c | 115 +++++++++++++++----
config.h | 2 +
refs.c | 11 ++
refs.h | 9 +-
refs/files-backend.c | 46 ++++++--
refs/refs-internal.h | 4 +
t/t3200-branch.sh | 256 +++++++++++++++++++++++++++++++++++++++++++
9 files changed, 476 insertions(+), 48 deletions(-)
--
2.13.1.611.g7e3b11ae1
next prev parent reply other threads:[~2017-07-05 23:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-05 22:35 What's cooking in git.git (Jul 2017, #01; Wed, 5) 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
2017-07-05 23:14 ` Ævar Arnfjörð Bjarmason [this message]
2017-07-06 0:37 ` [PATCH v2 0/3] branch: add a --copy to go with --move 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-09-26 21:39 ` Ævar Arnfjörð Bjarmason
2017-09-27 2:02 ` Junio C Hamano
2017-09-29 18:30 ` Ævar Arnfjörð Bjarmason
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 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170705231454.15666-1-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=sahildua2305@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.