Skip to content
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

After a fetch perform a diff against the remote of the current branch #509

Merged
merged 2 commits into from
Oct 2, 2024

Conversation

raymond-rebbeck
Copy link
Contributor

@raymond-rebbeck raymond-rebbeck commented Oct 2, 2024

After performing a fetch I almost always get an unexpected and seemingly incorrect list of changed files.

The diff is being done with ..origin specifed however (at least on my setup) this only ever results in the diff being done against the main branch and not the remote for the branch that I am actually on, which would be for example a feature branch that was branched from another non-main branch.

Unless I am misunderstanding what the intended result of this diff output is then it seems as though the current branch name should be specified too, for example ..origin/foo/feature1 so that the diff is comparing the local foo/feature1 branch with the corresponding remote, this is the diff output that I would expect to see.

git version 2.34.1
IRIS for UNIX (Ubuntu Server LTS for x86-64 Containers) 2024.1 (Build 267_2U) Tue Apr 30 2024 16:04:37 EDT

Copy link
Collaborator

@isc-tleavitt isc-tleavitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @raymond-rebbeck - great catch! Added a CHANGELOG.md entry for this and merging.

@isc-tleavitt isc-tleavitt merged commit f3fd329 into intersystems:main Oct 2, 2024
1 check passed
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.

2 participants