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

Avoid ambiguity of branch/directory names for the git-diff-tree command #8070

Merged

Conversation

@typeless
Copy link
Contributor

commented Sep 3, 2019

Fixes #8029

When there is a directory at the top with the name clashed with the branch name,
the git diff-tree command will not be able to figure out the ambiguity.

Also, remove an outdated comment.

@typeless typeless changed the title Avoid ambiguity of branch/directory names for the git-diff-tree comma… Avoid ambiguity of branch/directory names for the git-diff-tree command Sep 3, 2019

@typeless typeless changed the title Avoid ambiguity of branch/directory names for the git-diff-tree command Avoid ambiguity of branch/directory names for the git-diff-tree command (#8066) Sep 3, 2019

@typeless typeless changed the title Avoid ambiguity of branch/directory names for the git-diff-tree command (#8066) Avoid ambiguity of branch/directory names for the git-diff-tree command Sep 3, 2019

@typeless

This comment has been minimized.

Copy link
Contributor Author

commented Sep 3, 2019

This is a backport for #8066

@GiteaBot GiteaBot added the lgtm/need 2 label Sep 3, 2019

@GiteaBot GiteaBot added lgtm/need 1 and removed lgtm/need 2 labels Sep 3, 2019

@lunny lunny added the kind/bug label Sep 3, 2019

@lunny lunny added this to the 1.9.3 milestone Sep 3, 2019

@lafriks
lafriks approved these changes Sep 3, 2019

@GiteaBot GiteaBot added lgtm/done and removed lgtm/need 1 labels Sep 3, 2019

@lafriks lafriks merged commit e7f6da3 into go-gitea:release/v1.9 Sep 3, 2019

2 checks passed

approvals/lgtm this commit looks good
continuous-integration/drone/pr Build is passing
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants
You can’t perform that action at this time.