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

Re: 2.37.2 can't "git pull" but 2.18.0 can

From
LDLana Deere <lana.deere@gmail.com>
Date
Sep 7, 2022, 15:56 UTC
Message-ID
<CA+4x=b9M+HRWdDx-Mr4q0NiRQESwJ5uEkOBL_nVPPPHhXs7i_g@mail.gmail.com>
In-Reply-To
<Yxf9yETBi3k6Wasl@danh.dev>
Sorry, I was confused by the "0 left".  With one more besect it says
9f489ac6bbb755fa4c83289e44cad12f3b765d69 is the first bad commit
That appears to be
 [9f489ac6bbb755fa4c83289e44cad12f3b765d69] Merge branch 'dl/zero-oid-in-hooks'
.. Lana (lana.deere@gmail.com)

On Tue, Sep 6, 2022 at 10:11 PM Đoàn Trần Công Danh <congdanhqx@gmail.com> wrote:

Show 40 quoted lines
>
> On 2022-09-06 15:37:45-0400, Lana Deere <lana.deere@gmail.com> wrote:
> > This is the final output from git bisect:
> >
> > $ git bisect good
> > Bisecting: 0 revisions left to test after this (roughly 0 steps)
> > [d8d3d632f4165955da49032d50279c20cfbde2e5] hooks--update.sample: use
> > hash-agnostic zero OID
> >
> > Does that offer any hint about what is going on?
>
> It is still bisecting, can you continue to bisect until it says
> something like:
>
>         first bad commit is ...
>
>
> >
> > Incidentally, some but not all of the pulls produced additional
> > output.  Maybe it's a clue?
> >
> > $ ~/tmp/git/install/bin/git pull
> > warning: Pulling without specifying how to reconcile divergent branches is
> > discouraged. You can squelch this message by running one of the following
> > commands sometime before your next pull:
> >
> >   git config pull.rebase false  # merge (the default strategy)
> >   git config pull.rebase true   # rebase
> >   git config pull.ff only       # fast-forward only
> >
> > You can replace "git config" with "git config --global" to set a default
> > preference for all repositories. You can also pass --rebase, --no-rebase,
> > or --ff-only on the command line to override the configured default per
> > invocation.
>
> This is a hint in some version of git for 2 modes of pull, you can
> ignore it.
>
> --
> Danh
Previous: Đoàn Trần Công DanhNext: Jeff King
Message 10 of 31 in “2.37.2 can't "git pull" but 2.18.0 can”
  1. Lana DeereSep 2, 2022
  2. brian m. carlsonSep 2, 2022
  3. Lana DeereSep 6, 2022
  4. Johannes SchindelinSep 7, 2022
  5. Lana DeereSep 7, 2022
  6. Jeff KingSep 8, 2022
  7. Jeff KingSep 3, 2022
  8. Lana DeereSep 6, 2022
  9. Đoàn Trần Công DanhSep 7, 2022
  10. Lana DeereSep 7, 2022
  11. Jeff KingSep 7, 2022
  12. Lana DeereSep 7, 2022
  13. Jeff KingSep 7, 2022
  14. Lana DeereSep 8, 2022
  15. Jeff KingSep 8, 2022
  16. 0/2 v2 protocol can't "git pull" with restricted refspecJeff King, Sep 8, 2022
  17. 1/2 fetch: stop checking for NULL transport->remote in do_fetch()Jeff King, Sep 8, 2022
  18. 2/2 fetch: add branch.*.merge to default ref-prefix extensionJeff King, Sep 8, 2022
  19. Junio C HamanoSep 8, 2022
  20. Junio C HamanoSep 8, 2022
  21. Jeff KingSep 9, 2022
  22. Junio C HamanoSep 9, 2022
  23. Jeff KingSep 11, 2022
  24. Lana DeereSep 9, 2022
  25. Junio C HamanoSep 9, 2022
  26. Lana DeereSep 12, 2022
  27. Jeff KingSep 13, 2022
  28. Johannes SchindelinSep 5, 2022
  29. Lana DeereSep 6, 2022
  30. Johannes SchindelinSep 7, 2022
  31. Lana DeereSep 7, 2022

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.