BUG: diffcore-rename.c:1674: tracking failed somehow; failed to find associated dst for broken pair

BUG: diffcore-rename.c:1674: tracking failed somehow; failed to find associated dst for broken pair

[Olaf Hering]

[-- Attachment #1: Type: text/plain, Size: 443 bytes --]

The following issue left my terminal in a weird state.
Is this a bug in the repository, or a bug in git 2.43/46?

set -ex
pushd /dev/shm
test -d x.git || git clone https://github.com/intel/linux-sgx.git x.git
cd $_
git checkout -b $PPID.$$ a53adeaab7a8176fabb415bfcdf6d29fe4060678
d=external/ippcp_internal/inc
git log -p -b -B -w --stat --follow "$d" |& tail
cd $d
git log -p -b -B -w --stat --follow . |& tail


Thanks,
Olaf

[-- Attachment #2: Digitale Signatur von OpenPGP --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: BUG: diffcore-rename.c:1674: tracking failed somehow; failed to find associated dst for broken pair

[Jeff King]

On Fri, Sep 20, 2024 at 11:22:28AM +0200, Olaf Hering wrote:

> The following issue left my terminal in a weird state.
> Is this a bug in the repository, or a bug in git 2.43/46?
> 
> set -ex
> pushd /dev/shm
> test -d x.git || git clone https://github.com/intel/linux-sgx.git x.git
> cd $_
> git checkout -b $PPID.$$ a53adeaab7a8176fabb415bfcdf6d29fe4060678
> d=external/ippcp_internal/inc
> git log -p -b -B -w --stat --follow "$d" |& tail
> cd $d
> git log -p -b -B -w --stat --follow . |& tail

Definitely a bug in Git, since we're hitting a BUG(). Looks like it
reproduces with just "-B --follow" on the path in question. Bisecting
leads to 9db2ac5616 (diffcore-rename: accelerate rename_dst setup,
2020-12-11). +cc Elijah.

-Peff

Re: BUG: diffcore-rename.c:1674: tracking failed somehow; failed to find associated dst for broken pair

[Elijah Newren]

On Fri, Sep 20, 2024 at 6:07 AM Jeff King <peff@peff.net> wrote:
>
> On Fri, Sep 20, 2024 at 11:22:28AM +0200, Olaf Hering wrote:
>
> > The following issue left my terminal in a weird state.
> > Is this a bug in the repository, or a bug in git 2.43/46?
> >
> > set -ex
> > pushd /dev/shm
> > test -d x.git || git clone https://github.com/intel/linux-sgx.git x.git
> > cd $_
> > git checkout -b $PPID.$$ a53adeaab7a8176fabb415bfcdf6d29fe4060678
> > d=external/ippcp_internal/inc
> > git log -p -b -B -w --stat --follow "$d" |& tail
> > cd $d
> > git log -p -b -B -w --stat --follow . |& tail
>
> Definitely a bug in Git, since we're hitting a BUG(). Looks like it
> reproduces with just "-B --follow" on the path in question. Bisecting
> leads to 9db2ac5616 (diffcore-rename: accelerate rename_dst setup,
> 2020-12-11). +cc Elijah.
>
> -Peff

Sorry for the lengthy delay; fix over here:
https://lore.kernel.org/git/pull.1876.git.1741395615315.gitgitgadget@gmail.com/

Re: BUG: diffcore-rename.c:1674: tracking failed somehow; failed to find associated dst for broken pair

[Jeff King]

On Thu, Mar 13, 2025 at 11:08:02PM -0700, Elijah Newren wrote:

> > Definitely a bug in Git, since we're hitting a BUG(). Looks like it
> > reproduces with just "-B --follow" on the path in question. Bisecting
> > leads to 9db2ac5616 (diffcore-rename: accelerate rename_dst setup,
> > 2020-12-11). +cc Elijah.
> >
> > -Peff
> 
> Sorry for the lengthy delay; fix over here:
> https://lore.kernel.org/git/pull.1876.git.1741395615315.gitgitgadget@gmail.com/

Thanks, I left some comments there.

-Peff