public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: git@vger•kernel.org
Subject: Re: [BUG] diffcore-rename with duplicate tree entries can segfault
Date: Tue, 24 Feb 2015 15:11:00 -0800	[thread overview]
Message-ID: <xmqqd24yq517.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20150224224918.GA24749@peff.net> (Jeff King's message of "Tue, 24 Feb 2015 17:49:18 -0500")

Jeff King <peff@peff•net> writes:

> I'm assuming there _is_ a sane sort order. We have two halves of a
> filepair, but I think before any of the rename or break detection kicks
> in, each pair should either:
>
>   1. Have a name in pair->one, and an invalid filespec in pair->two
>      (i.e., a deletion).
>
>   2. The opposite (name in pair->two, /dev/null in pair->one). An
>      addition.
>
>   3. The same name in pair->one and pair->two.

I think creation and deletion are expressed with mode=0 and not with
/dev/null.

  reply	other threads:[~2015-02-24 23:11 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-24 21:43 [BUG] diffcore-rename with duplicate tree entries can segfault Jeff King
2015-02-24 22:42 ` Junio C Hamano
2015-02-24 22:49   ` Jeff King
2015-02-24 23:11     ` Junio C Hamano [this message]
2015-02-24 23:47       ` Jeff King
2015-02-25  5:00         ` Junio C Hamano
2015-02-25 21:40           ` Jeff King
2015-02-25 21:50             ` Junio C Hamano
2015-02-27  1:38               ` [PATCH 0/2] " Jeff King
2015-02-27  1:39                 ` [PATCH 1/2] diffcore-rename: split locate_rename_dst into two functions Jeff King
2015-02-27  1:42                 ` [PATCH 2/2] diffcore-rename: avoid processing duplicate destinations Jeff King
2015-02-27 21:48                   ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqd24yq517.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=peff@peff$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox