[UPDATE] Plugin: git

[ncanceill]

Update branch

Plugin: git

This branch contains updates for the git plugin.

Status

MERGED with some issues: see #3990.

This is now merged (a449d53).

There is still some stuff to do:

• Test completion now that most compdefs were removed
• Settle the debate on gp/gl versus gP/gp
• Do another sweep to include any pending PRs related to this plugin
• Update the wiki
• Squash commits, because atomicity is out of the window already

Changelog

• Fixes Git plugin improvement #1500
• Fixes Exit early from git plugin if not in git repo. #1504
• Fixes plugins/git: missing compdefs, fix bad copy-paste #1546
• Fixes ggpush and ggpull [origin] #1601
• Fixes remove duplicate alias & update gd #1800
• Fixes Add submodule helpers to Git plugin #1966
• Fixes adds 'git branch --no-merged' with alias gbnm to git #1982
• Fixes Add a 'git fetch origin' alias -> 'gfeo' #2124
• Fixes Avoid showing 'git rm' usage when using gwip alias #2338
• Fixes Fix gmt compdef #2407
• Fixes blame + unstage  #2433
• Fixes Git plugin conflicts with GNU coreutils on Mac #2463
• Fixes New aliases based on https://ochronus.com/git-tips-from-the-trenches/ #2493
• Uses New git plugin: git2 #2494, fixes Another git alias #1846
• Fixes Add aliases for git rebase and git rebase --skip #2546
• Fixes Small mistake #2684
• Fixes Fix gwip alias for some BSD flavors of xargs #2714
• Fixes add an alias to show available stashes #2921
• Fixes [Git-Aliases]Added verbose variants to push & pull #3085
• Fixes Check if there is a git repository dir. #3091
• Fixes Add an alias for 'git checkout -b' #3122
• Fixes duplicate alias in git.plugin #3276
• Fixes [RDY] Remove (outdated) compdefs for git branch and git remote #3374
• Fixes Remove duplicate diff alias in git plugin #3543
• Fixes [feature] Add git rebase alias #3680, fixes Add grb as alias for git rebase #3708
• Fixes Remove --max-count option from git log #3711
• Fixes Quick way to "git branch --set-upstream-to=origin/<branch> <branch>" #3726
• Fixes Add git-fetch aliases to git plugin #3749
• Fixes git.plugin: Fix typos in comments #3763
• Fixes added alias for git clone #3836

[kipanshi]

That's great!

[mcornella]

If you're wondering, this is removed because it's a duplicate of line 6

[mcornella]

👍

[Kriechi]

👍

[mcornella]

You can also pull in this one: #2407

[mcornella]

Hey @ncanceill, your PR inspired me to convert our little hunting of obsolete issues into a PR that closes them all. But first I wanted to run some tests to figure out what syntax worked.
I made a private repository to run the tests, but I thought it might be of public interest so there it goes: https://github.com/mcornella/close-issues-test/

If you're curious it's a fun thing to look at, but it basically boils down to:

1. Closing is done if it's inside a commit message (title and/or content), or if it's in the PR body (but not in the PR title). Source
2. Comma-separated issues don't work, you need to specify the magic word (close/fix/resolve) before each issue (this is what you've done with this one 👍). Source

I'll submit the new PR once it's ready

[ncanceill]

Yo @mcornella,

I added #2407.

About your initiative on closing issues: now that's scientific spirit! I am sure GitHub will be happy to know that you experimented to confirm how their auto-closing system works. =D

You may be starting to know me by now, so you may know how I just happen to miss things sometimes. Indeed, that little Tip about auto-closing only working from PR body, not title, went completely unnoticed on my part. I have cleaned up the title now, thank you.

One last thing: I believe we should keep those "Update PRs" a bit specific (like this one is specific to the Git plugin), before maybe merging them all into one PR to end all PRs.

[mcornella]

Another git plugin related one: #1601. Can we make this happen?

[ncanceill]

Done (which shorter names). I also took the liberty to reorganize the plugin (just cut-paste in that commit, no real change).

[ncanceill]

This is the best completion option I found, but I am not an expert, feel free to advise.

[mcornella]

Maybe git-pull would be more appropriate

[ncanceill]

Sadly, this does not work.

In the function, the remote (ie origin) is already set, and the only argument should be a branch name. However, since this is a function, not an alias, Zsh completion is unable to see that the first argument to git pull is already there. As a result, using git-pull for completion will return a choice of remote names, instead of branch names.

I found using git-checkout is a good workaround, since it does complete branch names as first argument.

Again, if someone has a better solution, let me hear it. =D

[gsemet]

you have to write a real completion script for this command, I guess...

[blueyed]

This works:

compdef -e 'words[1]=(git pull origin); service=git; (( CURRENT+=2 )); _git' ggl

(Thanks to Mikachu on #zsh)

[gsemet]

that quite a kung foo move...

[ncanceill]

Hey, what do you guys think of the idea from #2494 to use gp for git pull and gP for git push, instead of respectively gl and gp? I believe it offers more consistency (of course all derivatives will be updated as well), and opens gl up for either git log or git ls-tree. Would that break much of your configs?

[mcornella]

I can't say anything in favor or against the alias change. I think that we will only know if it breaks people's workflow once it's merged. I don't know how we should approach such a change in a sensible manner, not in this pull request nor in any other..

[ncanceill]

OK, so that's one blank vote. I agree this probably belongs in another PR — when this one is merged, and we have a testing branch (or use mine).

[mcornella]

OK, so that's one blank vote.

EU elections reference? 😄

So I didn't specifically say that this belonged in another pull request, specially if no one else comments here against that change, which means that it will probably go unnoticed until it is merged and someone actually notices the alias change.

What I actually called for was some sort of automatic changelog of aliases or functions or whatever, that said "here's what's changed since your last update", so people could see that it changed.
This is more complex than it seems, and I don't expect you to go and write it in a few minutes just to include the one alias change, but rather I was throwing it out as a nice feature to have. This is similar to a previous feature request I made in #2769. You can of course add the alias.

[mcornella]

Pull request #1800 and related #2684 are probably fixed, but are not marked as closed by this PR.

[ncanceill]

Done.

[mcornella]

#1982, alias gbnm to git branch --no-merged

[ncanceill]

Actually, I was thinking of removing the pipe, for two reasons:

• In the current form, the alias requires an argument for grep, which does not feel right to me.
• The output of ls-files can be useful for other commands, like less, head, and others.

@yachi what do you think?

[yachi]

• we can implement it as a function like gdv(), to emphasize it requires an argument, let me do another PR
• personally i use gfg a lot to grep file names as argument to do operations, like

perl -p -i -e 's#tomato#potato#g' `gfg html$`

and

gfg pyc$ | xargs git rm -f

@ncanceill for your concern i suggest we add another alias alias glf=git ls-files