Thread (23 messages) flat view 23 messages, 5 authors, 2022-09-09

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

From: Lana Deere <hidden>
Date: 2022-09-07 15:57:14

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
[off-list ref] wrote:
On 2022-09-06 15:37:45-0400, Lana Deere [off-list ref] wrote:
quoted
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 ...

quoted
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help