public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
* git pull with configured rebase is incorrectly rebasing
@ 2026-02-26 23:13 Mark Kharitonov
  2026-02-27  9:11 ` Phillip Wood
  0 siblings, 1 reply; 2+ messages in thread
From: Mark Kharitonov @ 2026-02-26 23:13 UTC (permalink / raw)
  To: Git Mailing List

Thank you for filling out a Git bug report!
Please answer the following questions to help us understand your issue.

What did you do before the bug happened?
git pull

What did you expect to happen?
Nothing, because there are no new changes.

What happened instead?
git started rebasing my changes onto master

What's different between what you expected and what actually happened?
Rebase should not have happened

Anything else you want to add:
---
C:\xyz\tip2 [feature/dotnetupgrade ↑875 +2 ~0 -0 !]> git lg -6 --first-parent
7d5c88a7305c |  (HEAD -> feature/dotnetupgrade, wip) Remove explicit
version spec from the package references (76 minutes ago) [Mark
Kharitonov] (2026-02-26 07:55:11 -0500)
fda62f506c75 |  Merge remote-tracking branch 'origin/master' into
feature/dotnetupgrade (79 minutes ago) [Mark Kharitonov] (2026-02-26
07:52:04 -0500)
c6bf5481ad79 |  Adjust binding redirects (80 minutes ago) [Mark
Kharitonov] (2026-02-26 07:51:12 -0500)
5ce2cdc4d4b9 |  Adjust the HR.Modules build (81 minutes ago) [Mark
Kharitonov] (2026-02-26 07:50:48 -0500)
68331ac06b93 |  Merge remote-tracking branch 'origin/master' into
feature/dotnetupgrade (13 hours ago) [Mark Kharitonov] (2026-02-25
20:22:03 -0500)
254eaee2eb36 |  (origin/feature/dotnetupgrade) Merge pull request
#96519 from DFTypedescriptorModelBinder (17 hours ago)
[prvalidation[bot]] (2026-02-25 16:40:39 -0500)
C:\xyz\tip2 [feature/dotnetupgrade ↑875 +2 ~0 -0 !]> git fetch origin
feature/dotnetupgrade
From *** REPO URL ***
 * branch                      feature/dotnetupgrade -> FETCH_HEAD
C:\xyz\tip2 [feature/dotnetupgrade ↑875 +2 ~0 -0 !]> git lg -1 FETCH_HEAD
254eaee2eb36 |  (origin/feature/dotnetupgrade) Merge pull request
#96519 from DFTypedescriptorModelBinder (17 hours ago)
[prvalidation[bot]] (2026-02-25 16:40:39 -0500)
C:\xyz\tip2 [feature/dotnetupgrade ↑875 +2 ~0 -0 !]>
```
```
C:\xyz\tip2 [feature/dotnetupgrade ↑875]> git config rebase.forkPoint
08:55:01.960045 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/bin
08:55:01.962048 git.c:502               trace: built-in: git config
rebase.forkPoint
false
C:\xyz\tip2 [feature/dotnetupgrade ↑875]> git pull
08:55:09.493632 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/bin
08:55:09.513454 git.c:502               trace: built-in: git pull
08:55:09.571114 run-command.c:674       trace: run_command: git
merge-base --fork-point refs/remotes/origin/feature/dotnetupgrade
feature/dotnetupgrade
08:55:09.571114 run-command.c:935       trace: start_command: git
merge-base --fork-point refs/remotes/origin/feature/dotnetupgrade
feature/dotnetupgrade
08:55:09.705292 run-command.c:674       trace: run_command: git fetch
--update-head-ok
08:55:09.705292 run-command.c:935       trace: start_command: git
fetch --update-head-ok
08:55:09.753363 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/libexec/git-core
08:55:09.774963 git.c:502               trace: built-in: git fetch
--update-head-ok
08:55:09.784675 run-command.c:674       trace: run_command:
GIT_DIR=.git git remote-https origin *** REPO URL ***
08:55:09.784675 run-command.c:935       trace: start_command: git
remote-https origin *** REPO URL ***
08:55:09.832505 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/libexec/git-core
08:55:09.853334 git.c:807               trace: exec: git-remote-https
origin *** REPO URL ***
08:55:09.853334 run-command.c:674       trace: run_command:
git-remote-https origin *** REPO URL ***
08:55:09.854340 run-command.c:935       trace: start_command:
git-remote-https origin *** REPO URL ***
08:55:09.894203 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/libexec/git-core
08:55:10.166061 run-command.c:674       trace: run_command: 'git
credential-manager get'
08:55:10.166061 run-command.c:935       trace: start_command:
'C:/Program Files/Git/usr/bin/sh.exe' -c 'git credential-manager get'
'git credential-manager get'
08:55:10.300457 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/libexec/git-core
08:55:10.321300 git.c:807               trace: exec: git-credential-manager get
08:55:10.321300 run-command.c:674       trace: run_command:
git-credential-manager get
08:55:10.321300 run-command.c:935       trace: start_command:
git-credential-manager get
08:55:10.500967 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/libexec/git-core
08:55:10.518302 git.c:502               trace: built-in: git config
--null --list
08:55:10.764217 run-command.c:674       trace: run_command: 'git
credential-manager store'
08:55:10.779970 run-command.c:935       trace: start_command:
'C:/Program Files/Git/usr/bin/sh.exe' -c 'git credential-manager
store' 'git credential-manager store'
08:55:10.907451 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/libexec/git-core
08:55:10.936422 git.c:807               trace: exec:
git-credential-manager store
08:55:10.936422 run-command.c:674       trace: run_command:
git-credential-manager store
08:55:10.936422 run-command.c:935       trace: start_command:
git-credential-manager store
08:55:11.119491 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/libexec/git-core
08:55:11.141470 git.c:502               trace: built-in: git config
--null --list
08:55:11.301265 run-command.c:674       trace: run_command: 'git
credential-manager store'
08:55:11.301265 run-command.c:935       trace: start_command:
'C:/Program Files/Git/usr/bin/sh.exe' -c 'git credential-manager
store' 'git credential-manager store'
08:55:11.540731 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/libexec/git-core
08:55:11.594252 git.c:807               trace: exec:
git-credential-manager store
08:55:11.595252 run-command.c:674       trace: run_command:
git-credential-manager store
08:55:11.595252 run-command.c:935       trace: start_command:
git-credential-manager store
08:55:11.956275 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/libexec/git-core
08:55:12.008964 git.c:502               trace: built-in: git config
--null --list
08:55:12.947796 run-command.c:674       trace: run_command: git
rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet
--alternate-refs
08:55:12.947796 run-command.c:935       trace: start_command: git
rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet
--alternate-refs
08:55:13.782656 run-command.c:1541      run_processes_parallel:
preparing to run up to 1 tasks
08:55:13.785656 run-command.c:1569      run_processes_parallel: done
08:55:13.785656 run-command.c:674       trace: run_command: git
maintenance run --auto --no-quiet --detach
08:55:13.788083 run-command.c:935       trace: start_command: git
maintenance run --auto --no-quiet --detach
08:55:13.835482 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/libexec/git-core
08:55:13.860648 git.c:502               trace: built-in: git
maintenance run --auto --no-quiet --detach
08:55:13.927319 run-command.c:674       trace: run_command: git rebase
--autostash --onto 254eaee2eb363e2771517fd41e5ac8149b93c8ef
254eaee2eb363e2771517fd41e5ac8149b93c8ef
08:55:13.927319 run-command.c:935       trace: start_command: git
rebase --autostash --onto 254eaee2eb363e2771517fd41e5ac8149b93c8ef
254eaee2eb363e2771517fd41e5ac8149b93c8ef
08:55:13.975412 exec-cmd.c:266          trace: resolved executable
dir: C:/Program Files/Git/mingw64/libexec/git-core
08:55:14.006868 git.c:502               trace: built-in: git rebase
--autostash --onto 254eaee2eb363e2771517fd41e5ac8149b93c8ef
254eaee2eb363e2771517fd41e5ac8149b93c8ef
08:55:17.002819 run-command.c:674       trace: run_command: 'git-lfs
filter-process'
08:55:17.009494 run-command.c:935       trace: start_command:
'C:/Program Files/Git/usr/bin/sh.exe' -c 'git-lfs filter-process'
'git-lfs filter-process'
08:55:17.473743 trace git-lfs: exec: git '-c' 'filter.lfs.smudge='
'-c' 'filter.lfs.clean=' '-c' 'filter.lfs.process=' '-c'
'filter.lfs.required=false' 'rev-parse' '--git-dir' '--show-toplevel'
08:55:17.548287 trace git-lfs: exec: git 'rev-parse' '--is-bare-repository'
08:55:17.617373 trace git-lfs: exec: git 'config' '--includes'
'--local' 'lfs.repositoryformatversion'
08:55:17.690074 trace git-lfs: exec: git 'config' '--includes' '-l'
08:55:17.767180 trace git-lfs: exec: git 'rev-parse' '--is-bare-repository'
08:55:17.836677 trace git-lfs: exec: git 'config' '--includes' '-l'
'--blob' ':.lfsconfig'
08:55:17.956280 trace git-lfs: exec: git 'config' '--includes' '-l'
'--blob' 'HEAD:.lfsconfig'
08:55:18.037584 trace git-lfs: Install hook: pre-push, force=false,
path=C:\xyz\tip2\.git\hooks\pre-push, upgrading...
08:55:18.038605 trace git-lfs: Install hook: post-checkout,
force=false, path=C:\xyz\tip2\.git\hooks\post-checkout, upgrading...
08:55:18.039123 trace git-lfs: Install hook: post-commit, force=false,
path=C:\xyz\tip2\.git\hooks\post-commit, upgrading...
08:55:18.039638 trace git-lfs: Install hook: post-merge, force=false,
path=C:\xyz\tip2\.git\hooks\post-merge, upgrading...
08:55:18.040215 trace git-lfs: Initialize filter-process
08:55:18.040734 trace git-lfs: exec: git '-c' 'filter.lfs.smudge='
'-c' 'filter.lfs.clean=' '-c' 'filter.lfs.process=' '-c'
'filter.lfs.required=false' 'rev-parse' 'HEAD' '--symbolic-full-name'
'HEAD'
08:55:18.117987 trace git-lfs: exec: git '-c' 'filter.lfs.smudge='
'-c' 'filter.lfs.clean=' '-c' 'filter.lfs.process=' '-c'
'filter.lfs.required=false' 'rev-parse' '--git-dir'
08:55:18.189954 trace git-lfs: exec: git '-c' 'filter.lfs.smudge='
'-c' 'filter.lfs.clean=' '-c' 'filter.lfs.process=' '-c'
'filter.lfs.required=false' 'remote'
08:55:18.261413 trace git-lfs: tq: running as batched queue, batch size of 100
08:55:18.261924 trace git-lfs: filepathfilter: accepting
"ImportExportSpecifications/Imports/HRImport/xyz HR Import
Specification.docx"
08:55:18.269411 trace git-lfs: filepathfilter: accepting
"ImportExportSpecifications/Imports/HRImport/xyz HR Import
Specification.pdf"
08:55:21.914397 trace git-lfs: filepathfilter: creating pattern ".git"
of type gitignore
08:55:21.914397 trace git-lfs: filepathfilter: creating pattern
"**/.git" of type gitignore
08:55:21.914921 trace git-lfs: filepathfilter: accepting "tmp"

Exiting because of "interrupt" signal.
C:\xyz\tip2 [feature/dotnetupgrade|REBASE-i ↑875 +98 ~964 -395 !]>
---

Please review the rest of the bug report below.
You can delete any lines you don't wish to share.


[System Info]
git version:
git version 2.51.1.windows.1
cpu: x86_64
built from commit: 1454f0a9c4a3a22fb3fd7cc33f76f88cd65ced41
sizeof-long: 4
sizeof-size_t: 8
shell-path: D:/git-sdk-64-build-installers/usr/bin/sh
feature: fsmonitor--daemon
libcurl: 8.16.0
OpenSSL: OpenSSL 3.5.4 30 Sep 2025
zlib: 1.3.1
SHA-1: SHA1_DC
SHA-256: SHA256_BLK
default-ref-format: files
default-hash: sha1
uname: Windows 10.0 26200
compiler info: gnuc: 15.2
libc info: no libc information available
$SHELL (typically, interactive shell): <unset>


[Enabled Hooks]
post-checkout
post-commit
post-merge
pre-push

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-02-27  9:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-26 23:13 git pull with configured rebase is incorrectly rebasing Mark Kharitonov
2026-02-27  9:11 ` Phillip Wood

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox