git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Marc Branchaud <marcnarc@xiplink.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Release note spelling and phrasing fixups.
Date: Mon, 28 Nov 2016 15:56:47 -0800	[thread overview]
Message-ID: <xmqqtwargnuo.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20161124165900.30605-1-marcnarc@xiplink.com> (Marc Branchaud's message of "Thu, 24 Nov 2016 11:59:00 -0500")

Marc Branchaud <marcnarc@xiplink.com> writes:

> Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
> ---
>
> Mostly just missing words and what I feel are clarifications.
>
> The biggest change is to the "git add -N" item.  Not 100% sure
> I got it right.
>
> 		M.

> - * When new paths were added by "git add -N" to the index, it was
> -   enough to circumvent the check by "git commit" to refrain from
> -   making an empty commit without "--allow-empty".  The same logic
> -   prevented "git status" to show such a path as "new file" in the
> + * "git commit" created an empty commit when invoked with an index
> +   consisting solely of intend-to-add paths (added with "git add -N").
> +   It now requires the "--allow-empty" option to create such a commit.
> +   The same logic prevented "git status" from showing such paths as "new files" in the
>     "Changes not staged for commit" section.

Yes this is much easier to read.  Greatly appreciated.

>   * Codepaths that read from an on-disk loose object were too loose in
> -   validating what they are reading is a proper object file and
> +   validating that they are reading a proper object file and
>     sometimes read past the data they read from the disk, which has
>     been corrected.  H/t to Gustavo Grieco for reporting.
> ...
> - * An author name, that spelled a backslash-quoted double quote in the
> -   human readable part "My \"double quoted\" name", was not unquoted
> + * An author name that has a backslash-quoted double quote in the
> +   human readable part ("My \"double quoted\" name"), was not unquoted
>     correctly while applying a patch from a piece of e-mail.
> ...
> - * It is a common mistake to say "git blame --reverse OLD path",
> -   expecting that the command line is dwimmed as if asking how lines
> + * "git blame --reverse OLD path" is now DWIMmed to show how lines
>     in path in an old revision OLD have survived up to the current
>     commit.
>     (merge e1d09701a4 jc/blame-reverse later to maint).
> ...
>   * The "submodule.<name>.path" stored in .gitmodules is never copied
>     to .git/config and such a key in .git/config has no meaning, but
> -   the documentation described it and submodule.<name>.url next to
> -   each other as if both belong to .git/config.  This has been fixed.
> +   the documentation described it next to submodule.<name>.url
> +   as if both belong to .git/config.  This has been fixed.

These, too.

> - * In a worktree connected to a repository elsewhere, created via "git
> + * In a worktree created via "git
>     worktree", "git checkout" attempts to protect users from confusion
>     by refusing to check out a branch that is already checked out in
>     another worktree.  However, this also prevented checking out a
> -   branch, which is designated as the primary branch of a bare
> +   branch which is designated as the primary branch of a bare
>     reopsitory, in a worktree that is connected to the bare
>     repository.  The check has been corrected to allow it.

This 'reopsitory' may already have been fixed ;-)

    ... goes and looks ...

Oops, no it hasn't.  I'll patch it up while queuing this.

> - * A hot-fix for a test added by a recent topic that went to both
> + * Hot-fixed a test added by a recent topic that went to both
>     'master' and 'maint' already.

Oops; an entry like this shouldn't have been in the release notes in
the first place, because those who are seeing the released versions
would have never seen such breakages.  Will try to remember removing
it.

Thanks, I missed this one completely even though you sent it out
last week and didn't have a chance to read it over before starting
today's integration cycle.

  reply	other threads:[~2016-11-28 23:56 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-23 23:21 [ANNOUNCE] Git v2.11.0-rc3 Junio C Hamano
2016-11-24 16:25 ` Marc Branchaud
2016-11-24 17:40   ` Johannes Sixt
2016-11-24 16:59 ` [PATCH] Release note spelling and phrasing fixups Marc Branchaud
2016-11-28 23:56   ` Junio C Hamano [this message]
2016-11-29  9:57 ` [PATCH] RelNotes: typo fix in 2.11.0 notes Tobias Klauser
2016-11-29 18:35   ` Junio C Hamano
2016-11-29 18:50     ` Tobias Klauser

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=xmqqtwargnuo.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=marcnarc@xiplink.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).