search

scmbreeze / scm_breeze

Adds numbered shortcuts to the output git status, and much more
https://madebynathan.com/2011/10/19/git-shortcuts-like-youve-never-seen-before/
MIT License
2.82k stars 192 forks source link

Replaced calls to '_git' wrapper with its contents, '__git_wrap__git_… #307

Closed telzhov closed 3 years ago

telzhov commented 3 years ago

…main'

Since '_git' has been removed in git 2.30. Closes #306”

jeffbyrnes commented 3 years ago

By the way, if you add “Closes #306” to the description, it will auto-close that issue when this merges.

telzhov commented 3 years ago

By the way, if you add “Closes #306” to the description, it will auto-close that issue when this merges.

Great, thank you.

telzhov commented 3 years ago

Sorry, accidentally closed it. Reopening.

hazelsparrow commented 3 years ago

hello, any chance of having this merged? 🙏

ghthor commented 3 years ago

We need to add a fallback if this new func doesnt exist. I might be able to add to this patch tomorrow.

On Mon, Jan 4, 2021, 1:44 PM Greg Sparrow notifications@github.com wrote:

hello, any chance of having this merged? 🙏

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/scmbreeze/scm_breeze/pull/307#issuecomment-754146762, or unsubscribe https://github.com/notifications/unsubscribe-auth/AABHEKRRTG5GNAX3GMA5RBLSYIECXANCNFSM4VRKBAAA .

telzhov commented 3 years ago

I wouldn't say git_wrapgit_main is new. Look, both _git and git_wrapgit_main were added at almost the same time (_git wrapper was added just a commit earlier):

git log -2 -p 93b291e0

And you'll find that __git_wrap__gitk_main is there, and _git together with _gitk were added in the previous b0a4b2d2.

Since scm breeze relies in its aliases.sh on _git added in b0a4b2d2,

$ git describe b0a4b2d2
v1.7.10.2-487-gb0a4b2d257

it doesn't support git v1.7.10.2 and earlier. Versions >= 1.7.10.3 && <= v2.29.2 contain both _git and __git_wrap__git_main (v2.30.0 has dropped _git wrapper as you know).

So I'm wondering what fallback code for __git_wrap__gitk_main do you mean?

Thank you.

We need to add a fallback if this new func doesnt exist. I might be able to add to this patch tomorrow.

ghthor commented 3 years ago

I had not done that inspection yet, thanks for looking into this! I'll get this merged today when I get to my computer.

On Tue, Jan 5, 2021, 3:53 AM Timur Elzhov notifications@github.com wrote:

I wouldn't say git_wrapgit_main is new. Look, both _git and git_wrapgit_main were added at almost the same time (_git wrapper was added just a commit earlier):

git log -2 -p 93b291e0

And you'll find that __git_wrap__gitk_main is there, and _git together with _gitk were added in the previous b0a4b2d2.

Since scm breeze relies in its aliases.sh on _git added in b0a4b2d2,

$ git describe b0a4b2d2 v1.7.10.2-487-gb0a4b2d257

it doesn't support git v1.7.10.2 and earlier. Versions >= 1.7.10.3 && <= v2.29.2 contain both _git and __git_wrap__git_main (v2.30.0 has dropped _git wrapper as you know).

So I'm wondering what fallback code for __git_wrap__gitk_main do you mean?

Thank you.

We need to add a fallback if this new func doesnt exist. I might be able to add to this patch tomorrow.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/scmbreeze/scm_breeze/pull/307#issuecomment-754498960, or unsubscribe https://github.com/notifications/unsubscribe-auth/AABHEKUSU3RETS3RTBHMQZ3SYLHPNANCNFSM4VRKBAAA .

telzhov commented 3 years ago

Awesome, thanks!