git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: <git@vger.kernel.org>, <j6t@kdbg.org>
Subject: Re: [PATCH] rebase docs: fix incorrect format of the section Behavioral Differences
Date: Wed, 05 Dec 2018 12:54:49 +0900	[thread overview]
Message-ID: <xmqqo9a0d3w6.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20181204231709.13824-1-newren@gmail.com> (Elijah Newren's message of "Tue, 4 Dec 2018 15:17:09 -0800")

Elijah Newren <newren@gmail.com> writes:

> Gah, when I was rebasing on your patch I adopted your sentence rewrite
> but forgot to remove the "sometimes".  Thanks for catching; correction:

>
> -- 8< --
> Subject: [PATCH v2] git-rebase.txt: update note about directory rename
>  detection and am
>
> In commit 6aba117d5cf7 ("am: avoid directory rename detection when
> calling recursive merge machinery", 2018-08-29), the git-rebase manpage
> probably should have also been updated to note the stronger
> incompatibility between git-am and directory rename detection.  Update
> it now.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>  Documentation/git-rebase.txt | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index 41631df6e4..ef76cccf3f 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -569,8 +569,12 @@ it to keep commits that started empty.
>  Directory rename detection
>  ~~~~~~~~~~~~~~~~~~~~~~~~~~
>  
> -The merge and interactive backends work fine with
> -directory rename detection.  The am backend sometimes does not.
> +The merge and interactive backends work fine with directory rename

I am not sure "work fine" a fair and correct label, as rename is
always heuristic.  

    The "directory rename detection" heuristic in "merge" and the
    "interactive" backends can take what happened to paths in the
    same directory into account when deciding if a disappeared path
    was "renamed" and to which other path.  The heuristic produces
    incorrect result when the information given is only about
    changed paths, which is why it is disabled when using the "am"
    backend.

perhaps.

  reply	other threads:[~2018-12-05  3:54 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-03 17:34 [PATCH] rebase docs: fix incorrect format of the section Behavioral Differences Johannes Sixt
2018-12-03 20:42 ` Martin Ågren
2018-12-03 20:50   ` Johannes Sixt
2018-12-04  2:49     ` Junio C Hamano
2018-12-03 20:56 ` Johannes Schindelin
2018-12-04 21:24 ` Elijah Newren
2018-12-04 21:53   ` Johannes Sixt
2018-12-04 23:17     ` Elijah Newren
2018-12-05  3:54       ` Junio C Hamano [this message]
2018-12-05  6:20         ` Elijah Newren
2018-12-05  6:57           ` Johannes Sixt
2018-12-05  7:40             ` Junio C Hamano
2018-12-05 15:37               ` Elijah Newren
2018-12-05 21:16                 ` Johannes Sixt
2018-12-05 22:46                   ` Junio C Hamano
2018-12-07 17:51                     ` [PATCH] git-rebase.txt: update note about directory rename detection and am Johannes Sixt
2018-12-07 18:46                       ` Elijah Newren
2018-12-09  0:22                         ` 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=xmqqo9a0d3w6.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    --cc=newren@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.
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).