From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Apr 2019, #05; Thu, 25)
Date: Thu, 25 Apr 2019 08:50:28 -0600 [thread overview]
Message-ID: <CABPp-BHbCKx61w7MFoNTFUORVD53OFAbkoqi04KRZG1C_sVtxw@mail.gmail.com> (raw)
In-Reply-To: <xmqqsgu6wfv9.fsf@gitster-ct.c.googlers.com>
On Thu, Apr 25, 2019 at 7:16 AM Junio C Hamano <gitster@pobox.com> wrote
> * en/unicode-in-refnames (2019-04-24) 1 commit
> - Honor core.precomposeUnicode in more places
>
> The names of the refs stored as filesystem entities may become
> different from what the end-user expects, just like files in the
> working tree gets "renamed", on a filesystem like HFS+. Work it
> around by paying attemption to the core.precomposeUnicode
> configuration.
>
> Looked sensible. Ready for next?
Almost. Torsten pointed out that I left some commentary in the commit
message that I should remove. I'll send a v2 with it excised.
Also, s/it around/around it/ and s/attemption/attention/ in your summary?
> * nd/switch-and-restore (2019-04-12) 43 commits
> - help: move git-diff and git-reset to different groups
> - rm: add --staged as alias for --cached
> - doc: promote "git restore"
> - user-manual.txt: prefer 'merge --abort' over 'reset --hard'
> - completion: support restore
> - t: add tests for restore
> - restore: support --patch
> - restore: replace --force with --ignore-unmerged
> - restore: default to --source=HEAD when only --staged is specified
> - restore: reject invalid combinations with --staged
> - restore: add --worktree and --staged
> - checkout: factor out worktree checkout code
> - restore: disable overlay mode by default
> - restore: make pathspec mandatory
> - restore: take tree-ish from --source option instead
> - checkout: split part of it to new command 'restore'
> - doc: promote "git switch"
> - completion: support switch
> - t: add tests for switch
> - switch: make --orphan switch to an empty tree
> - switch: reject if some operation is in progress
> - switch: no worktree status unless real branch switch happens
> - switch: implicit dwim, use --no-guess to disable it
> - switch: add short option for --detach
> - switch: only allow explicit detached HEAD
> - switch: reject "do nothing" case
> - switch: stop accepting pathspec
> - switch: remove -l
> - switch: add --discard-changes
> - switch: better names for -b and -B
> - checkout: split part of it to new command 'switch'
> - checkout: split options[] array in three pieces
> - checkout: move 'confict_style' and 'dwim_..' to checkout_opts
> - checkout: make "opts" in cmd_checkout() a pointer
> - checkout: factor out some code in parse_branchname_arg()
> - checkout: keep most #include sorted
> - checkout: inform the user when removing branch state
> - checkout: advice how to get out of detached HEAD mode
> - t: rename t2014-switch.sh to t2014-checkout-switch.sh
> - git-checkout.txt: fix monospace typeset
> - doc: document --overwrite-ignore
> - git-checkout.txt: fix one syntax line
> - git-checkout.txt: spell out --no-option
>
> Two new commands "git switch" and "git restore" are introduced to
> split "checking out a branch to work on advancing its history" and
> "checking out paths out of the index and/or a tree-ish to work on
> advancing the current history" out of the single "git checkout"
> command.
>
> The "switch" part seems more or less ready for testing. Perhaps
> we should split this back into two topics and merge it to 'next'.
> cf. <20190329103919.15642-1-pclouds@gmail.com> (switch v6)
> cf. <20190411131218.19195-1-pclouds@gmail.com> (restore v2)
Splitting apart and advancing "switch" makes sense to me. I'm behind
on stuff but really need to take a look at the new restore series;
I'll try to get to that soon.
next prev parent reply other threads:[~2019-04-25 14:50 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-25 10:15 What's cooking in git.git (Apr 2019, #05; Thu, 25) Junio C Hamano
2019-04-25 14:50 ` Elijah Newren [this message]
2019-04-25 22:16 ` js/partial-clone-connectivity-check (was: What's cooking in git.git (Apr 2019, #05; Thu, 25)) Josh Steadmon
2019-05-02 2:52 ` Jeff King
2019-05-02 16:48 ` Josh Steadmon
2019-05-02 21:45 ` Jeff King
2019-05-02 22:24 ` Jeff King
2019-05-06 19:16 ` [PATCH] perf-lib.sh: make "./run <revisions>" use the correct gits Ævar Arnfjörð Bjarmason
2019-05-06 20:24 ` Jeff King
2019-05-06 23:23 ` [PATCH v2 0/2] perf-lib.sh: fix 0baf78e7bc regression, refactor & fix bugs Ævar Arnfjörð Bjarmason
2019-05-07 7:06 ` Jeff King
2019-05-07 10:54 ` [PATCH v3 0/6] " Ævar Arnfjörð Bjarmason
2019-05-07 21:36 ` Jeff King
2019-05-08 1:59 ` Junio C Hamano
2019-05-07 10:54 ` [PATCH v3 1/6] perf README: correct docs for 3c8f12c96c regression Ævar Arnfjörð Bjarmason
2019-05-07 10:54 ` [PATCH v3 2/6] perf aggregate: remove GIT_TEST_INSTALLED from --codespeed Ævar Arnfjörð Bjarmason
2019-05-07 10:54 ` [PATCH v3 3/6] perf-lib.sh: make "./run <revisions>" use the correct gits Ævar Arnfjörð Bjarmason
2019-05-07 10:54 ` [PATCH v3 4/6] perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh Ævar Arnfjörð Bjarmason
2019-05-07 10:54 ` [PATCH v3 5/6] perf tests: add "bindir" prefix to git tree test results Ævar Arnfjörð Bjarmason
2019-05-07 10:54 ` [PATCH v3 6/6] perf-lib.sh: forbid the use of GIT_TEST_INSTALLED Ævar Arnfjörð Bjarmason
2019-05-06 23:23 ` [PATCH v2 1/2] perf-lib.sh: make "./run <revisions>" use the correct gits Ævar Arnfjörð Bjarmason
2019-05-07 7:19 ` Jeff King
2019-05-06 23:23 ` [PATCH v2 2/2] perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh Ævar Arnfjörð Bjarmason
2019-05-07 7:16 ` Jeff King
2019-05-07 8:31 ` Ævar Arnfjörð Bjarmason
2019-05-07 21:23 ` Jeff King
2019-04-26 5:05 ` What's cooking in git.git (Apr 2019, #05; Thu, 25) Taylor Blau
2019-04-26 5:41 ` Junio C Hamano
2019-04-26 5:53 ` Taylor Blau
2019-04-26 6:01 ` Junio C Hamano
2019-04-26 17:58 ` Kaartic Sivaraam
2019-04-27 5:06 ` Junio C Hamano
2019-04-27 5:57 ` Kaartic Sivaraam
2019-05-02 3:09 ` Jeff King
2019-04-29 22:20 ` js/macos-gettext-build, was " Johannes Schindelin
2019-05-05 5:13 ` Junio C Hamano
2019-05-06 9:11 ` Duy Nguyen
2019-05-07 2:36 ` Junio C Hamano
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=CABPp-BHbCKx61w7MFoNTFUORVD53OFAbkoqi04KRZG1C_sVtxw@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).