Performance improvement for large repos! (Avoid using "git status") #52
Conversation
|
I have had problems with this in large repos as well, and appreciate the improvement. However, in the past, I've had trouble with "git rev-parse" before. I'll annotate the changeset. |
prompt.sh
Outdated
| if [[ "$status" != "" ]]; then | ||
| git_dirty='*' | ||
| local branch | ||
| if branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null); then |
There was a problem hiding this comment.
I've had problems with this before; it didn't work in a detached head state. My solution was to instead use "git name-rev --name-only HEAD" instead.
There was a problem hiding this comment.
That part is just copied from the find_git_branch() function. The actual contribution here is in line 20: "git diff-index ..."
But yes, lines 4 and 16 could probably be improved, too.
There was a problem hiding this comment.
ah I just checked the behaviour by checking out an old commit (4 commits ago), and while the traditional output for line 4 is "(detached*)", yours becomes the slightly more verbose "(remotes/origin/HEAD~4)".
But this seems like a matter of taste? Or what were the specific problems?
There was a problem hiding this comment.
Maybe I'm confused and it was something else, sorry. I have a Makefile that tries to determine branch name, so "detached" wasn't good enough. For an interactive prompt, it should be.
|
Ah just saw that this also doesn't show dirty for untracked files. But I think there were some other pull requestes dealing with that? Might be good to have two separate indicators for this, anyway. |
|
Honestly, I don't want/use untracked indication. That is different than dirty. |
…present. (Without using "git status") This nicely splits up the needed functionality of "git status" into two functions without the speed loss. There is now also a small function that combines both indicators into what used to be given by "git status", but without the performance loss on large repos. These strings can now be used in your git-aware prompt: \$git_changed - Shows if tracked files have been changed. \$git_untracked - Shows if untracked files (or folders) are present. \$git_untracked_num - Shows the number of untracked files or folders if present. \$git_dirty - Shows if tracked files have been changed or untracked files are present. (Combines the above) \$git_branch - The current branch, as before.
|
Oh, oops. Well, now i've made them anyway. |
|
This change is still slow for me on very large repos. Here's a function to read alanhamlett/dotfiles/bashrc#L15 |
|
Also, this one is faster: https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh |
The function find_git_dirty() delayed prompt display by over a second when in a large repo, so I now use the plumbing commands instead of "git status". Because we don't actually need to generate a list of all the changed files just to see if the repo is dirty. Further improvements possible.
Also, there's some more verbosity to keep the command output reliable.
(Errcode 128 applies e.g. when in any .git folder)
Finally, I surrounded this by the test for branch name as in find_git_branch(), to avoid output on non-git folders. Other implementation imaginable.