All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Braun <thomas.braun@virtuell-zuhause.de>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: 2.29.0.rc0.windows.1: Duplicate commit id error message when fetching
Date: Wed, 7 Oct 2020 22:28:36 +0200	[thread overview]
Message-ID: <55f8f00c-a61c-67d4-889e-a9501c596c39@virtuell-zuhause.de> (raw)

Hi,

I'm using

$ git --version
git version 2.29.0.rc0.windows.1

Since I upgraded to that version (thanks to dscho for providing these so
early) I'm seeing occasionally

$ git fetch origin +refs/head/abcd:refs/remotes/origin/abcd
fatal: unexpected duplicate commit id
31a13139875bc5f49ddcbd42b4b4d3dc18c16576

The local branch abcd is at

$ git rev-parse HEAD
b6ae1ee2adcb75aee09c4a8d72bfd66f32f6fae1

while its remote tracking branch is at

$ git rev-parse @{u}
31a13139875bc5f49ddcbd42b4b4d3dc18c16576

I have pull.rebase=true set but I think this does not matter for fetch.
I do have protocol V2 enabled.

A full trace is

$ GIT_TRACE=1 git fetch origin +refs/heads/abcd:refs/remotes/origin/abcd
22:23:42.016859 exec-cmd.c:237          trace: resolved executable dir:
C:/Program Files/Git/mingw64/bin
22:23:42.018858 git.c:444               trace: built-in: git fetch
origin +refs/heads/abcd:refs/remotes/origin/abcd
22:23:42.020858 run-command.c:663       trace: run_command: unset
GIT_PREFIX; GIT_PROTOCOL=version=2 ssh -o SendEnv=GIT_PROTOCOL
git@github.com 'git-upload-pack '\''XXX/YYY.git'\'''
22:23:43.284643 run-command.c:663       trace: run_command: git rev-list
--objects --stdin --not --all --quiet --alternate-refs
22:23:43.344644 run-command.c:663       trace: run_command: git rev-list
--objects --stdin --not --all --quiet --alternate-refs
22:23:43.358613 exec-cmd.c:237          trace: resolved executable dir:
C:/Program Files/Git/mingw64/libexec/git-core
22:23:43.360614 git.c:444               trace: built-in: git rev-list
--objects --stdin --not --all --quiet --alternate-refs
22:23:43.492616 run-command.c:1617      run_processes_parallel:
preparing to run up to 1 tasks
22:23:43.492616 run-command.c:1649      run_processes_parallel: done
fatal: unexpected duplicate commit id
31a13139875bc5f49ddcbd42b4b4d3dc18c16576

The repo is public, so if it helps I can provide a link.

Anything I'm doing wrong here?

Thanks,
Thomas

             reply	other threads:[~2020-10-07 20:51 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-07 20:28 Thomas Braun [this message]
2020-10-07 21:06 ` 2.29.0.rc0.windows.1: Duplicate commit id error message when fetching Jeff King
2020-10-08  9:52   ` Thomas Braun
2020-10-08 12:06     ` Jeff King
2020-10-08 12:50       ` Derrick Stolee
2020-10-08 13:22         ` Derrick Stolee
2020-10-09 15:29           ` Thomas Braun
2020-10-09 16:49             ` Derrick Stolee
2020-10-09 17:12               ` Thomas Braun
2020-10-09 17:46                 ` Derrick Stolee
2020-10-09 17:55                   ` Jeff King
2020-10-09 18:28                     ` Taylor Blau
2020-10-09 18:33                       ` Derrick Stolee
2020-10-09 18:37                         ` Taylor Blau

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=55f8f00c-a61c-67d4-889e-a9501c596c39@virtuell-zuhause.de \
    --to=thomas.braun@virtuell-zuhause.de \
    --cc=git@vger.kernel.org \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.