Skip to content

Show remote branches in log #1640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 12, 2023

Conversation

cruessler
Copy link
Collaborator

@cruessler cruessler commented Apr 9, 2023

I opened this draft in order to have the PR run on CI. make check passes on 1.68.2, but one tests fails on nightly. The PR itself is mostly done, I think. I’ll add more context to this description in the coming days.

This Pull Request closes #1501.

It changes the following:

  • Show remote branches in revlog
  • Don’t show upstream if commit is local branch head

I followed the checklist:

  • I added unittests
  • I ran make check without errors
  • I tested the overall application
  • I added an appropriate item to the changelog

@extrawurst
Copy link
Collaborator

Looks like nightly is just broken on master

@extrawurst
Copy link
Collaborator

Ping me once you thinks it’s ready 🙏

@cruessler
Copy link
Collaborator Author

@extrawurst You can already start testing the main functionality. The two things I still want to add are a changelog entry and a bit more context on possible refactorings.

@extrawurst extrawurst marked this pull request as ready for review April 11, 2023 13:50
@extrawurst
Copy link
Collaborator

lgtm lets move this over the finish line

@extrawurst
Copy link
Collaborator

extrawurst commented Apr 11, 2023

Screenshot 2023-04-11 at 15 51 52

small nitpick. we probably can just use the same notation aka {...} for remote branches aswell, don't you think? the remotes name kinda implies it already? have not looked at tig - lets compare how the others are doing it

@cruessler
Copy link
Collaborator Author

tig has it the other way around. It uses [main] for local branches and {origin/main} for remote branches (that’s where I got the inspiration from). tig also uses different colors for local or remote branches. But you’re right, the naming probably always or most of the time also provides this piece of information. To be honest, I don’t have a preference.

@extrawurst extrawurst merged commit 3e0ec29 into gitui-org:master Apr 12, 2023
@extrawurst
Copy link
Collaborator

Thanks @cruessler - Great works as always ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

show remote branches In log
2 participants