alicederyn / git-graph-branch Goto Github PK

Visually indicate branches that have been merged into their local upstream, ideally in grey.

Notes:

• Branches merged into remote upstream of the same name do not count (these are assumed to be local replicas).
• Any grey branch should be able to be passed to git branch -d without a warning.

git-worktree allows one to have multiple worktrees for the same repo. It works by creating a .git file instead of directory, which points back to the parent checkout. It would be great if git-graph-branch worked in a worktree (currently it has deep assumptions baked in about files living under .git/).

Internal errors currently require a code change to understand, as the stack trace is removed. A debug flag to reenable the stack trace would help.

Older refs may be removed from .git/refs and packed. Currently this results in them disappearing from the git-graph-branch output.

See also https://git-scm.com/docs/git-pack-refs

Traceback (most recent call last):
  File "git_graph_branch/__init__.py", line 58, in main
    print_branch(art, b, config)
  File "git_graph_branch/display.py", line 72, in print_branch
    print(SYNC_STATUS_ICON[remote_sync_status(b)], end="")
                           ^^^^^^^^^^^^^^^^^^^^^
  File "git_graph_branch/display.py", line 50, in remote_sync_status
    if b.upstream.commit.commit_date > b.commit.commit_date:
       ^^^^^^^^^^^^^^^^^
  File "git_graph_branch/git/branch.py", line 45, in commit
    with open(self._ref, "r", encoding="ascii") as f:
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: '.../.git/refs/remotes/origin/main'

The underlying problem in this particular case appears to be #4, as refs/remotes/origin/main is present in .git/packed-refs, but in general we should be resilient to missing upstream refs.

I've noticed that when adding a new branch with git checkout -b, the upstream link is missing until I kill and restart git-graph-branch. This is on a polled filesystem.

While rebasing onto main is usually preferred, sometimes during github review cycles it's cleaner to instead merge in latest changes from main (there's even a button on the UI). It would be nice if the "N unmerged" notification took these into account, as currently it shows branches as being behind main even when they are not.