GitSavvy icon indicating copy to clipboard operation
GitSavvy copied to clipboard

Is there a way to do a Git Pull from one of the dashboards?

Open winehook opened this issue 3 years ago • 4 comments

Hello, this isn't really an issue but a question, but wasn't sure where to ask. I love the product first of all, depend upon it and use it every day, thanks for your amazing work on this.

When I pull a branch from GitHub, I always do the command palette and do Git Pull, which works just fine. But that feels like something that might be on a dashboard somewhere? Am I just blind and that's on one of the dashboards somewhere? Apologies in advance if I'm missing something obvious.

Thanks very much.

winehook avatar Apr 13 '21 14:04 winehook

Really looks like it is not bound to the typical dashboards. I usually do this from the "Repo History" view. (Press <enter> while the cursor is on the HEAD commit. Press <h> to go to the HEAD commit.)

image

Often I also fetch first to get a "preview" of what will change.

It would feel natural to have it in the "branches" dashboard, I think.

kaste avatar Apr 13 '21 19:04 kaste

Ah, got it -- I feel like I had seen it somewhere at some point, that must have been it. I don't use that dashboard much, so that'd explain it. Not a biggie, just was wondering. I agree with you that it would be a good fit in the branches dashboard!

winehook avatar Apr 13 '21 20:04 winehook

I'm not a branches dashboard user but after looking at this it looks like a "bug". In the dashboard we have:

[p] push selected to remote
[P] push all branches to remote
[h] fetch remote branches
[m] merge selected into active branch
[M] fetch and merge into active branch

Here m works for the current branch, but the uppercase M, which reads fetch and merge (=pull), does not work for the current active branch.
From reading https://github.com/timbrel/GitSavvy/pull/722 this should implement the "pull" behavior, as in fetch then merge, but it does not. Doing the pull literally in this case would of course implement the fetch then rebase strategy as well.

By reading the code, m maybe only works by pure luck for the current branch. I tend to say the original authors had not merging the current branch in mind while implementing. Not sure why.

kaste avatar Apr 18 '21 20:04 kaste

Interesting -- thank you for digging into it! Not a big deal, as I said -- maybe one way to handle it would be to check out a different branch and then do the M and check out the newly updated branch. Or just the command palette as I'm doing now. Thanks for the deep dive! You can close this ticket anytime.

winehook avatar Apr 19 '21 14:04 winehook