git {{ .BranchStatus }} reports as ≢ even with upstream #4900
Replies: 1 comment 9 replies
-
|
This is not really a bug. You can see that Which means according to git, that one has no upstream. Otherwise it would show |
Beta Was this translation helpful? Give feedback.
-
|
And git is up to date? |
Beta Was this translation helpful? Give feedback.
-
also here is my .gitconfig [user]
email = censored@gmail.com
name = BPplays
[core]
editor = nvim
autocrlf = false
[safe]
directory = H:\\My Files\\Programs\\AI\\KoboldAI
directory = '*'
directory = '*'
directory = H:\\My Files\\Programs\\AI\\KoboldAI
directory = H:/My Files/Programs/AI/KoboldAI
directory = H:/My Files/3D/CAD
[alias]
c = commit -m
a = add .
p = push origin HEAD
ac = !git add -A && git commit -m
acp = "!f() { git add -A && git commit -m \"$1\" && git push origin HEAD; }; f"
iacp = "!f() { git init -b main && git add -A && git commit -m init && git remote add origin \"$1\" && git push --set-upstream origin main; }; f"
clb = "!f() { git clone --bare \"$1\" .bare && echo \"gitdir: ./.bare\" > .git && if [ \"$(expr substr $(uname -s) 1 10)\" == \"MINGW32_NT\" ]; then attrib +h .bare && attrib +h .git; elif [ \"$(expr substr $(uname -s) 1 10)\" == \"MINGW64_NT\" ]; then attrib +h .bare && attrib +h .git; fi; }; f"
wa = worktree add
wr = worktree remove
bl = branch -a
sr = "!f() { current_branch=$(git rev-parse --abbrev-ref HEAD); if git rev-parse --verify --quiet \"$1\" >/dev/null; then git branch --set-upstream-to=\"$1\" \"$current_branch\"; else git push --set-upstream origin \"$current_branch\"; fi; }; f"
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
|
Beta Was this translation helpful? Give feedback.
-
|
What does it show when you run |
Beta Was this translation helpful? Give feedback.
-
|
Beta Was this translation helpful? Give feedback.
-
|
@BPplays I'm actually convinced your setup discovered a bug in git. It's a rather unconventional repo structure, and status SHOULD report the upstream with that additional switch, yet it doesn't. |
Beta Was this translation helpful? Give feedback.
-
Code of Conduct
What happened?
git {{ .BranchStatus }} reports as ≢ (\u2262) even with upstream. there is a bare git repo in .bare and it's being pointed to by a .git file and im using git worktrees
the file layout
Theme
{ "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", "var": { "golang": "" }, "palette": { "os": "#ACB0BE", "ff_white": "#FFFFFF", "rosewater": "#f5e0dc", "flamingo": "#f2cdcd", "pink": "#f5c2e7", "mauve": "#cba6f7", "red": "#f38ba8", "maroon": "#eba0ac", "peach": "#fab387", "yellow": "#f9e2af", "green": "#a6e3a1", "teal": "#94e2d5", "sky": "#89dceb", "sapphire": "#74c7ec", "blue": "#89b4fa", "lavender": "#b4befe", "text": "#cdd6f4", "subtext1": "#bac2de", "subtext0": "#a6adc8", "overlay2": "#9399b2", "overlay1": "#7f849c", "overlay0": "#6c7086", "surface2": "#585b70", "surface1": "#45475a", "surface0": "#313244", "base": "#1e1e2e", "mantle": "#181825", "crust": "#11111b", "clock": "p:teal", "inv_text": "p:surface0", "logo_color": "p:ff_white", "git_color": "p:lavender", "golang_color": "p:sapphire", "rust_color": "p:peach", "py_color": "p:yellow" }, "blocks": [ { "alignment": "left", "segments": [ { "background": "p:blue", "foreground": "p:logo_color", "powerline_symbol": "\ue0b4", "leading_diamond": "\ue0b6", "style": "diamond", "template": "{{.Icon}} ", "type": "os" }, { "background": "p:blue", "foreground": "p:inv_text", "powerline_symbol": "\ue0b4", "style": "diamond", "min_width": 80, "template": "{{ .UserName }}@{{ $truncated_hostname := split \".\" .HostName }}{{ $truncated_hostname._0 }}", "type": "session" }, { "background": "p:blue", "foreground": "p:inv_text", "powerline_symbol": "\ue0b4", "style": "diamond", "max_width": 79, "template": "{{ .UserName }}@{{ $truncated_hostname := split \".\" .HostName }}{{ trunc 5 $truncated_hostname._0 }}", "type": "session" }, { "background": "p:mauve", "foreground": "p:inv_text", "properties": { "folder_icon": "\uf115 ", "home_icon": "~", "style": "agnoster_short" }, "powerline_symbol": "\ue0b4", "style": "powerline", "template": " {{ .Path }}", "type": "path" } ], "type": "prompt" }, { "type": "prompt", "alignment": "right", "segments": [ { "background": "p:py_color", "foreground": "p:inv_text", "leading_diamond": "\ue0b6", "style": "diamond", "properties": { "display_mode": "context" }, "template": "\ue235 {{ if .Error }}{{ .Error }}{{ else }}{{ if .Venv }}{{ .Venv }} {{ end }}{{ .Full }}{{ end }}", "trailing_diamond": "\ue0b4 ", "type": "python" }, { "type": "go", "style": "diamond", "leading_diamond": "\ue0b6", "trailing_diamond": "\ue0b4 ", "foreground": "p:inv_text", "background": "p:golang_color", "template": "<p:ff_white> </>{{ .Full }}" }, { "type": "rust", "style": "diamond", "leading_diamond": "\ue0b6", "trailing_diamond": "\ue0b4 ", "foreground": "p:inv_text", "background": "p:rust_color", "template": "<p:ff_white> </>{{ .Full }}" }, { "background": "p:git_color", "foreground": "p:inv_text", "style": "diamond", "leading_diamond": "\ue0b6", "trailing_diamond": "\ue0b4 ", "properties": { "branch_icon": "\ue725 ", "cherry_pick_icon": "\ue29b ", "commit_icon": "\uf417 ", "fetch_status": true, "fetch_upstream_icon": false, "merge_icon": "\ue727 ", "no_commits_icon": "\uf594 ", "rebase_icon": "\ue728 ", "revert_icon": "\uf0e2 ", "tag_icon": "\uf412 " }, "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} {{ .StashCount }}{{ end }}", "type": "git" }, { "type": "command", "style": "diamond", "leading_diamond": "\ue0b6", "trailing_diamond": "\ue0b4 ", "foreground": "p:inv_text", "background": "p:clock", "properties": { "shell": "sh", "command": "sec -ls" }, "min_width": 80, "template": "秒{{ .Output }}" }, { "type": "executiontime", "style": "diamond", "leading_diamond": "\ue0b6", "trailing_diamond": "\ue0b4 ", "foreground": "p:inv_text", "background": "p:mauve", "template": " <p:inv_text></> {{ .FormattedMs }} ", "max_width": 79, "properties": { "threshold": 500, "style": "amarillo", "always_enabled": true } } ] }, { "alignment": "left", "newline": true, "segments": [ { "foreground": "p:inv_text", "background": "p:pink", "style": "diamond", "leading_diamond": "\ue0b6", "trailing_diamond": "\ue0b4", "template": "{{if .Root }}{{ end }}>", "type": "text" } ], "type": "prompt" } ], "final_space": true, "version": 2 }What OS are you seeing the problem on?
Windows
Which shell are you using?
powershell
Log output
Beta Was this translation helpful? Give feedback.
All reactions