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.

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

Fix diff of renamed and modified file #1967

Merged
merged 1 commit into from
Jun 14, 2017
Merged

Fix diff of renamed and modified file #1967

merged 1 commit into from
Jun 14, 2017

Conversation

ethantkoenig
Copy link
Member

Fixes #1949. Set diffFile.IsRenamed to true whenever the filename changes, even if the file contents are also modified.

@lunny lunny added this to the 1.2.0 milestone Jun 14, 2017
@lunny
Copy link
Member

lunny commented Jun 14, 2017

fmt failed.

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 14, 2017
@ethantkoenig
Copy link
Member Author

Fixed fmt

@lunny
Copy link
Member

lunny commented Jun 14, 2017

LGTM

@tboerger tboerger 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 Jun 14, 2017
@appleboy
Copy link
Member

LGTM

@tboerger tboerger 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 Jun 14, 2017
@appleboy appleboy merged commit 57cabb3 into go-gitea:master Jun 14, 2017
@ethantkoenig ethantkoenig deleted the fix/move_file branch June 14, 2017 12:53
@ethantkoenig ethantkoenig mentioned this pull request Jul 11, 2017
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Jul 11, 2017
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@appleboy appleboy appleboy approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.2.0
Development

Successfully merging this pull request may close these issues.

404 on "View File" in Diff view if file was also moved
4 participants
@ethantkoenig @lunny @appleboy @tboerger