From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: Lana Deere <lana.deere@gmail.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: 2.37.2 can't "git pull" but 2.18.0 can
Date: Wed, 7 Sep 2022 09:11:20 +0700 [thread overview]
Message-ID: <Yxf9yETBi3k6Wasl@danh.dev> (raw)
In-Reply-To: <CA+4x=b-GYMnZygHXOfNb3CdSRoxUeT80n=gSCLyfCA9WsB0wEw@mail.gmail.com>
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
next prev parent reply other threads:[~2022-09-07 2:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-02 19:27 2.37.2 can't "git pull" but 2.18.0 can Lana Deere
2022-09-02 20:16 ` brian m. carlson
2022-09-06 18:26 ` Lana Deere
2022-09-07 12:59 ` Johannes Schindelin
2022-09-07 15:59 ` Lana Deere
2022-09-08 18:20 ` Jeff King
2022-09-03 1:07 ` Jeff King
2022-09-06 19:37 ` Lana Deere
2022-09-07 2:11 ` Đoàn Trần Công Danh [this message]
2022-09-07 15:56 ` Lana Deere
2022-09-07 18:21 ` Jeff King
2022-09-07 18:53 ` Lana Deere
2022-09-07 21:10 ` Jeff King
2022-09-08 16:46 ` Lana Deere
2022-09-08 18:14 ` Jeff King
2022-09-08 19:23 ` [PATCH 0/2] v2 protocol can't "git pull" with restricted refspec Jeff King
2022-09-08 19:24 ` [PATCH 1/2] fetch: stop checking for NULL transport->remote in do_fetch() Jeff King
2022-09-08 19:26 ` [PATCH 2/2] fetch: add branch.*.merge to default ref-prefix extension Jeff King
2022-09-08 20:36 ` Junio C Hamano
2022-09-08 20:48 ` Junio C Hamano
2022-09-09 2:17 ` Jeff King
2022-09-09 5:23 ` Junio C Hamano
2022-09-11 5:08 ` Jeff King
2022-09-09 17:32 ` 2.37.2 can't "git pull" but 2.18.0 can Lana Deere
2022-09-09 18:27 ` Junio C Hamano
2022-09-12 14:58 ` Lana Deere
2022-09-13 0:28 ` Jeff King
2022-09-05 10:25 ` Johannes Schindelin
2022-09-06 18:38 ` Lana Deere
2022-09-07 10:20 ` Johannes Schindelin
2022-09-07 16:01 ` Lana Deere
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=Yxf9yETBi3k6Wasl@danh.dev \
--to=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=lana.deere@gmail.com \
--cc=peff@peff.net \
/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.