git/list[1] front-page[2] threads[3] people[4] search[5] about
 

"added by them" uses wrong path?

From
JSJohannes Spangenberg <johanness@lucanet.com>
Date
Apr 23, 2020, 11:36 UTC
Message-ID
<AM4PR0101MB22119DD9773B24C041A2E936B8D30@AM4PR0101MB2211.eurprd01.prod.exchangelabs.com>

Hello, I noticed that "added by them" might show paths which doesn't exits in any previous commit. I'm not sure if that is intended behavior but it was very confusing to me. I attached a quite small repository to reproduce the problem. The problem occurs when branch "a" is merged into "master". Here is what happens since you might not want to look into the repository yourself.

Git shows me the following status.
    $ git status
    On branch master
    You have unmerged paths.
      (fix conflicts and run "git commit")
      (use "git merge --abort" to abort the merge)
    Unmerged paths:
      (use "git add/rm <file>..." as appropriate to mark resolution)
            both deleted:    front_0/separator/end_0
            added by us:     front_1/separator/end_0
            added by them:   front_1/separator/end_1
    no changes added to commit (use "git add" and/or "git commit -a")

However, the file in branch "a" was actually called `front_0/separator/end_1`, not `front_1/separator/end_1`.

I updated to the latest version of Git for Windows to check if the issue still exists.

    $ git --version --build-options
    git version 2.26.2.windows.1
    cpu: x86_64
    built from commit: 4267c88d0d8936ae723bba55e0576b1c4f3d4e1a
    sizeof-long: 4
    sizeof-size_t: 8

Best Regards, Johannes

Message 1 of 1 in “"added by them" uses wrong path?”
  1. Johannes SpangenbergApr 23, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.