Skip to content

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

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Sep 3, 2019
Merged

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

merged 2 commits into from
Sep 3, 2019

Conversation

typeless
Copy link
Contributor

@typeless typeless 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
Copy link
Contributor Author

typeless commented Sep 3, 2019

This is a backport for #8066

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 3, 2019
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Sep 3, 2019
@lunny lunny added the type/bug label Sep 3, 2019
@lunny lunny added this to the 1.9.3 milestone Sep 3, 2019
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Sep 3, 2019
@lafriks lafriks merged commit e7f6da3 into go-gitea:release/v1.9 Sep 3, 2019
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

+1 more reviewer

@guillep2k guillep2k guillep2k approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.9.3
Development

Successfully merging this pull request may close these issues.
5 participants
@typeless @lafriks @guillep2k @lunny @GiteaBot