"Cannot rebase onto multiple branches."

[AndrewSav]

Every now and then, when I pull I'm getting a error message "cannot rebase onto multiple branches". It happens a couple of times per day. Pulling again usually does not produce the error and pulls successfully. What could be the reason? This is not something I can reproduce at will, it seems to happen randomly and regularly. 0.42

[stefanhaller]

Interesting, this should have been fixed in v0.41 (see 76e39af).

Which git version are you using? The above-mentioned fix requires git 2.29 or later.

If it's not that, the only other explanation for me is that you have some other app running that periodically auto-fetches in the background (some IDEs do this by default), and doesn't use the --no-write-fetch-head option like we do. If you can identify which program does this, see if it has an option to turn this off.

[AndrewSav]

2.34.1

[AndrewSav]

If it's not that, the only other explanation for me is that you have some other app running that periodically auto-fetches in the background

Unlikely. Another datapoint this is usually happens during the first pull in the morning, that is when I have not used the computer for a few hours. It never happened before 0.42, or shortly before that time if there were a few releases in rapid succession. I'm a long time user, this was introduced relatively recently

[AndrewSav]

Is there anything I can do to help diagnosing?

[stefanhaller]

Then I'm out of ideas I'm afraid.

You could run lazygit with the -d option (it tells it to log a lot of stuff to a debug log); then, when it happens again, post the log here. (Use lazygit -l to see where the log is. The output of lazygit -l itself is probably not enough unless it was running all the time.)

I can't promise we'll be able to see anything from the log, but it may be worth a shot.

[eerison]

it would be nice if we could rebase multiple branches

[stefanhaller]

This seems very unrelated to the error message we're talking about here. Sounds more like an enhancement request; if you feel strongly about it, please open a new issue for it. If you do, please describe the use case that you would use it for, it's rather unclear to me.

[AndrewSav]

Just to update, I'm still having this issue on 0.45. Every morning the first pull produce this error and then no errors on repeat. This hints that if you try to pull when a fetch is ongoing, you will get this error. I think what's happeing is that I'm pulling during this background fetch, which is not properly syncronized, which results in this issue.

This also seems relevant because I do indeed always have [pull] rebase=true in my globlal .gitconfig

[jesseduffield]

I also have that same git config option applied, but I can't reproduce locally. I've increased the rate of background fetches by adding this to my lazygit config:

refresher:
    fetchInterval: 1

But I can't get an error to occur if I spam the pull action

[Ten0]

I have the same error sometimes when running git pull with vanilla git and VSCode running in the background. I suspect that indeed running git pull at the same time as a git fetch is running (which VSCode is liable to run in the background) may cause this issue. It's unclear to me what a workaround would be.

[stefanhaller]

This sounds like a bug in VS Code then; seems like they don't use the --no-write-fetch-head option when running their background fetch. Might be worth reporting to them.

The workaround is of course to turn off VS Code's auto fetch (with the git.autofetch config) if you use lazygit and rely on its autofetch.

[AndrewSav]

For the record: I'm not using VS Code, I'm still getting the issue daily, sometimes several times a day if I have not used lazygit for a few hours.

[AndrewSav]

@stefanhaller hypothetically speaking, let's assume I can reproduce that. What can I do to help resolve that?

[stefanhaller]

Can you try updating your git version to see if this fixes it?

[AndrewSav]

Getting back to the auditd log above. Potentially stupid question, but how do you tell which commands were called by lazygit? (I'm not familiar with auditd.)

I also learned about auditd only today, so not an expert. After I posted the log, but before I posted the conclusion, I looked up how to get the parent process. This is done via lines that I have not inclided in the log, not the EXECVE but SYSCALL just above the corresponding EXECVE line. I analysed the full log, and compared the process ID I was getting, and confirmed that they match lazygit's.

[AndrewSav]

Can you try updating your git version to see if this fixes it?

Yes, I just tried it it seems to have fixed it. Thank you for your assistance. (Since it was intermittent I cannot be 100% sure it is fixed, but I think it is very likely)

[AndrewSav]

Wild guess: do you have fetch.parallel set in your git config?

I did not set it, and I checked the global one and the repo one and it is not there, unless it's a default, I do not think this is it.

[stefanhaller]

Yes, I just tried it it seems to have fixed it.

Good, let's hope it's reliable. Do let me know if it happens again.

Wild guess: do you have fetch.parallel set in your git config?

I did not set it, and I checked the global one and the repo one and it is not there, unless it's a default, I do not think this is it.

I played with this a bit, and found it quite confusing: even when I set fetch.parallel to 1 (which is the default when unset), it seems that it still spawns a subprocess with the --amend flag. So this is still a plausible explanation for your error.

[AndrewSav]

{"command":"git --version","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git --version (1.250923ms)","time":"2025-07-07T09:13:47+12:00"}
{"command":"git -C /home/ra/github/awx-playbooks/roles/lm_add_object_sdt/files rev-parse --path-format=absolute --show-toplevel --absolute-git-dir --git-common-dir --is-bare-repository --show-superproject-working-tree","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git -C /home/ra/github/awx-playbooks/roles/lm_add_object_sdt/files rev-parse --path-format=absolute --show-toplevel --absolute-git-dir --git-common-dir --is-bare-repository --show-superproject-working-tree (2.186691ms)","time":"2025-07-07T09:13:47+12:00"}
{"command":"git -C /home/ra/github/awx-playbooks/roles/lm_add_object_sdt/files rev-parse --path-format=absolute --show-toplevel --absolute-git-dir --git-common-dir --is-bare-repository --show-superproject-working-tree","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git -C /home/ra/github/awx-playbooks/roles/lm_add_object_sdt/files rev-parse --path-format=absolute --show-toplevel --absolute-git-dir --git-common-dir --is-bare-repository --show-superproject-working-tree (1.787399ms)","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"starting main loop","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"Binary is not built with the buildBinary flag so we won't check for an update","time":"2025-07-07T09:13:47+12:00"}
{"command":"git fetch --all --no-write-fetch-head","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"refreshing all scopes in async mode","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"Refresh took 36.357µs","time":"2025-07-07T09:13:47+12:00"}
{"command":"git branch --show-current","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"command":"git stash list -z --pretty=%ct|%gs","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"command":"git for-each-ref --sort=-creatordate --format=%(refname)%00%(objecttype)%00%(contents:subject) refs/tags","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"command":"git for-each-ref --sort=-committerdate --format=%(HEAD)%00%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(push:track)%00%(subject)%00%(objectname)%00%(committerdate:unix) refs/heads","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git for-each-ref --sort=-creatordate --format=%(refname)%00%(objecttype)%00%(contents:subject) refs/tags (830.213µs)","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"postRefreshUpdate for tags took 6.187µs","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git branch --show-current (1.399955ms)","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git for-each-ref --sort=refname --format=%(refname) refs/remotes (1.069778ms)","time":"2025-07-07T09:13:47+12:00"}
{"command":"git merge-base andrew andrew@{u}","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"command":"git rev-parse --symbolic-full-name main@{u}","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"postRefreshUpdate for remotes took 118.516µs","time":"2025-07-07T09:13:47+12:00"}
{"command":"git rev-parse --symbolic-full-name master@{u}","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"postRefreshUpdate for remoteBranches took 3.655µs","time":"2025-07-07T09:13:47+12:00"}
{"level":"debug","msg":"Error getting git config value for key: status.showUntrackedFiles. Error: the key is not found for [git config --get --null status.showUntrackedFiles]","time":"2025-07-07T09:13:47+12:00"}
{"command":"git status --untracked-files=all --porcelain -z --find-renames=50%","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git for-each-ref --sort=-committerdate --format=%(HEAD)%00%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(push:track)%00%(subject)%00%(objectname)%00%(committerdate:unix) refs/heads (1.940816ms)","time":"2025-07-07T09:13:47+12:00"}
{"command":"git worktree list --porcelain","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git merge-base andrew andrew@{u} (1.543636ms)","time":"2025-07-07T09:13:47+12:00"}
{"level":"debug","msg":"Error getting git config value for key: rebase.updateRefs. Error: the key is not found for [git config --get --null rebase.updateRefs]","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git rev-parse --symbolic-full-name main@{u} (1.518827ms)","time":"2025-07-07T09:13:47+12:00"}
{"command":"git rev-parse --symbolic-full-name master@{u}","level":"error","msg":"fatal: no such branch: 'master'\n","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git rev-parse --symbolic-full-name master@{u} (1.496558ms)","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git stash list -z --pretty=%ct|%gs (2.768473ms)","time":"2025-07-07T09:13:47+12:00"}
{"command":"git rev-parse --verify --quiet refs/remotes/origin/master","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"postRefreshUpdate for stash took 419.515µs","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git worktree list --porcelain (1.067804ms)","time":"2025-07-07T09:13:47+12:00"}
{"command":"git -C /home/ra/github/awx-playbooks rev-parse --path-format=absolute --absolute-git-dir","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"command":"git rev-parse --verify --quiet refs/remotes/origin/master","level":"error","msg":"","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git rev-parse --verify --quiet refs/remotes/origin/master (830.416µs)","time":"2025-07-07T09:13:47+12:00"}
{"command":"git rev-parse --verify --quiet refs/heads/master","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git -C /home/ra/github/awx-playbooks rev-parse --path-format=absolute --absolute-git-dir (711.502µs)","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"postRefreshUpdate for worktrees took 47.591µs","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"postRefreshUpdate for localBranches took 80.877µs","time":"2025-07-07T09:13:47+12:00"}
{"command":"git rev-parse --verify --quiet refs/heads/master","level":"error","msg":"","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git rev-parse --verify --quiet refs/heads/master (690.926µs)","time":"2025-07-07T09:13:47+12:00"}
{"command":"git merge-base HEAD refs/remotes/origin/main","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git merge-base HEAD refs/remotes/origin/main (1.733286ms)","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git status --untracked-files=all --porcelain -z --find-renames=50% (5.569951ms)","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"postRefreshUpdate for submodules took 6.892µs","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"postRefreshUpdate for files took 16.083µs","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git log HEAD --topo-order --oneline --pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%P%x00%m%x00%s --abbrev=40 -300 --no-show-signature -- (7.260297ms)","time":"2025-07-07T09:13:47+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"postRefreshUpdate for commits took 257.777µs","time":"2025-07-07T09:13:47+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:47+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git -c log.showSignature=false log -g --abbrev=40 --format=%h%x00%ct%x00%gs%x00%P (25.384135ms)","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"postRefreshUpdate for reflogCommits took 18.039679ms","time":"2025-07-07T09:13:47+12:00"}
{"command":"git for-each-ref --sort=-committerdate --format=%(HEAD)%00%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(push:track)%00%(subject)%00%(objectname)%00%(committerdate:unix) refs/heads","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"git for-each-ref --sort=-committerdate --format=%(HEAD)%00%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(push:track)%00%(subject)%00%(objectname)%00%(committerdate:unix) refs/heads (1.5247ms)","time":"2025-07-07T09:13:47+12:00"}
{"level":"info","msg":"postRefreshUpdate for localBranches took 168.382µs","time":"2025-07-07T09:13:47+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:47+12:00"}
{"command":"git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium refs/heads/andrew --","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:47+12:00"}
{"command":"git pull --no-edit","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:48+12:00"}
{"level":"info","msg":"git fetch --all --no-write-fetch-head (2.661714238s)","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"refreshing the following scopes in sync mode: branches,commits,remotes,tags","time":"2025-07-07T09:13:49+12:00"}
{"command":"git for-each-ref --sort=-creatordate --format=%(refname)%00%(objecttype)%00%(contents:subject) refs/tags","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:49+12:00"}
{"command":"git branch --show-current","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"git for-each-ref --sort=-creatordate --format=%(refname)%00%(objecttype)%00%(contents:subject) refs/tags (2.191938ms)","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"postRefreshUpdate for tags took 12.355µs","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"refreshed tags in 2.466804ms","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"git branch --show-current (2.163536ms)","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"git for-each-ref --sort=refname --format=%(refname) refs/remotes (2.212428ms)","time":"2025-07-07T09:13:49+12:00"}
{"command":"git merge-base andrew andrew@{u}","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"postRefreshUpdate for remotes took 79.011µs","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"postRefreshUpdate for remoteBranches took 7.519µs","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"refreshed remotes in 2.743209ms","time":"2025-07-07T09:13:49+12:00"}
{"command":"git merge-base HEAD refs/remotes/origin/main","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"git -c log.showSignature=false log -g --abbrev=40 --format=%h%x00%ct%x00%gs%x00%P (3.961766ms)","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"git merge-base andrew andrew@{u} (2.137522ms)","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"git merge-base HEAD refs/remotes/origin/main (2.08707ms)","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"git log HEAD --topo-order --oneline --pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%P%x00%m%x00%s --abbrev=40 -300 --no-show-signature -- (7.112734ms)","time":"2025-07-07T09:13:49+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"postRefreshUpdate for commits took 461.66µs","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"refreshed commits and commit files in 10.491346ms","time":"2025-07-07T09:13:49+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"postRefreshUpdate for reflogCommits took 10.951522ms","time":"2025-07-07T09:13:49+12:00"}
{"command":"git for-each-ref --sort=-committerdate --format=%(HEAD)%00%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(push:track)%00%(subject)%00%(objectname)%00%(committerdate:unix) refs/heads","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"git for-each-ref --sort=-committerdate --format=%(HEAD)%00%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(push:track)%00%(subject)%00%(objectname)%00%(committerdate:unix) refs/heads (1.34044ms)","time":"2025-07-07T09:13:49+12:00"}
{"command":"git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium refs/heads/andrew --","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"postRefreshUpdate for localBranches took 85.806µs","time":"2025-07-07T09:13:49+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"refreshed reflog and branches in 17.403186ms","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"Refresh took 17.482053ms","time":"2025-07-07T09:13:49+12:00"}
{"level":"info","msg":"git pull --no-edit (2.693963324s)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"refreshing all scopes in async mode","time":"2025-07-07T09:13:51+12:00"}
{"level":"debug","msg":"using cache for key status.showUntrackedFiles","time":"2025-07-07T09:13:51+12:00"}
{"command":"git for-each-ref --sort=-creatordate --format=%(refname)%00%(objecttype)%00%(contents:subject) refs/tags","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"command":"git stash list -z --pretty=%ct|%gs","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"command":"git branch --show-current","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"command":"git status --untracked-files=all --porcelain -z --find-renames=50%","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"Refresh took 62.347µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"refreshing all scopes in async mode","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"Refresh took 83.045µs","time":"2025-07-07T09:13:51+12:00"}
{"command":"git for-each-ref --sort=-creatordate --format=%(refname)%00%(objecttype)%00%(contents:subject) refs/tags","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"command":"git stash list -z --pretty=%ct|%gs","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git branch --show-current (1.116455ms)","time":"2025-07-07T09:13:51+12:00"}
{"command":"git merge-base andrew andrew@{u}","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git for-each-ref --sort=-creatordate --format=%(refname)%00%(objecttype)%00%(contents:subject) refs/tags (1.333631ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for tags took 13.134µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git for-each-ref --sort=refname --format=%(refname) refs/remotes (1.320335ms)","time":"2025-07-07T09:13:51+12:00"}
{"command":"git merge-base HEAD refs/remotes/origin/main","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for remotes took 143.192µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for remoteBranches took 8.125µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git for-each-ref --sort=-creatordate --format=%(refname)%00%(objecttype)%00%(contents:subject) refs/tags (1.026168ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for tags took 5.191µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git for-each-ref --sort=refname --format=%(refname) refs/remotes (1.258999ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for remotes took 35.934µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for remoteBranches took 3.071µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git -c log.showSignature=false log -g --abbrev=40 --format=%h%x00%ct%x00%gs%x00%P (2.390425ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git merge-base andrew andrew@{u} (1.204062ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git stash list -z --pretty=%ct|%gs (2.498472ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for stash took 25.632µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git -c log.showSignature=false log -g --abbrev=40 --format=%h%x00%ct%x00%gs%x00%P (2.004957ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git merge-base HEAD refs/remotes/origin/main (1.269021ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git stash list -z --pretty=%ct|%gs (2.235695ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for stash took 26.914µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git status --untracked-files=all --porcelain -z --find-renames=50% (6.306594ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"debug","msg":"using cache for key status.showUntrackedFiles","time":"2025-07-07T09:13:51+12:00"}
{"command":"git status --untracked-files=all --porcelain -z --find-renames=50%","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git log HEAD --topo-order --oneline --pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%P%x00%m%x00%s --abbrev=40 -300 --no-show-signature -- (9.21841ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for commits took 177.565µs","time":"2025-07-07T09:13:51+12:00"}
{"command":"git branch --show-current","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git status --untracked-files=all --porcelain -z --find-renames=50% (4.660589ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git branch --show-current (1.367304ms)","time":"2025-07-07T09:13:51+12:00"}
{"command":"git merge-base andrew andrew@{u}","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"command":"git merge-base HEAD refs/remotes/origin/main","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git merge-base HEAD refs/remotes/origin/main (974.468µs)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git merge-base andrew andrew@{u} (1.054131ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for reflogCommits took 10.793628ms","time":"2025-07-07T09:13:51+12:00"}
{"command":"git for-each-ref --sort=-committerdate --format=%(HEAD)%00%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(push:track)%00%(subject)%00%(objectname)%00%(committerdate:unix) refs/heads","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for submodules took 6.885µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for files took 6.248µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for submodules took 2.18µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for files took 1.835µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git for-each-ref --sort=-committerdate --format=%(HEAD)%00%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(push:track)%00%(subject)%00%(objectname)%00%(committerdate:unix) refs/heads (1.587844ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:51+12:00"}
{"command":"git worktree list --porcelain","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git worktree list --porcelain (694.721µs)","time":"2025-07-07T09:13:51+12:00"}
{"command":"git -C /home/ra/github/awx-playbooks rev-parse --path-format=absolute --absolute-git-dir","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git -C /home/ra/github/awx-playbooks rev-parse --path-format=absolute --absolute-git-dir (761.18µs)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for worktrees took 22.085µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for localBranches took 34.672µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git log HEAD --topo-order --oneline --pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%P%x00%m%x00%s --abbrev=40 -300 --no-show-signature -- (6.303043ms)","time":"2025-07-07T09:13:51+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for commits took 664.136µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for reflogCommits took 21.476376ms","time":"2025-07-07T09:13:51+12:00"}
{"command":"git for-each-ref --sort=-committerdate --format=%(HEAD)%00%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(push:track)%00%(subject)%00%(objectname)%00%(committerdate:unix) refs/heads","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git for-each-ref --sort=-committerdate --format=%(HEAD)%00%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(push:track)%00%(subject)%00%(objectname)%00%(committerdate:unix) refs/heads (1.525978ms)","time":"2025-07-07T09:13:51+12:00"}
{"command":"git worktree list --porcelain","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git worktree list --porcelain (746.975µs)","time":"2025-07-07T09:13:51+12:00"}
{"command":"git -C /home/ra/github/awx-playbooks rev-parse --path-format=absolute --absolute-git-dir","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"git -C /home/ra/github/awx-playbooks rev-parse --path-format=absolute --absolute-git-dir (978.179µs)","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for worktrees took 16.304µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"info","msg":"postRefreshUpdate for localBranches took 22.498µs","time":"2025-07-07T09:13:51+12:00"}
{"level":"debug","msg":"using cache for key rebase.updateRefs","time":"2025-07-07T09:13:51+12:00"}
{"level":"error","msg":"ignoring create popup panel because a popup panel is already open","time":"2025-07-07T09:13:52+12:00"}
{"level":"error","msg":"ignoring create popup panel because a popup panel is already open","time":"2025-07-07T09:13:53+12:00"}
{"command":"git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium refs/heads/andrew --","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:55+12:00"}
{"command":"git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium refs/heads/andrew --","level":"debug","msg":"RunCommand","time":"2025-07-07T09:13:56+12:00"}

[AndrewSav]

I'm not seeing the error in this log, but it was displayed on screen.