The /compare/x...y page now displays diff from the merge-base to y instead of from x to y #5795

New Issue

GiteaMirror · 2025-11-02T06:36:11-06:00

GiteaMirror commented

2025-11-02 06:36:11 -06:00

Originally created by @CyberShadow on GitHub (Jul 28, 2020).

To reproduce:

$ git init repo && cd repo
Initialized empty Git repository in /home/vladimir/tmp/2020-07-28/repo/.git/

$ echo a > file.txt

$ git add . && git commit -m 'Initial commit'
[master (root-commit) 4b97f6e] Initial commit
 1 file changed, 1 insertion(+)
 create mode 100644 file.txt

$ echo b > file.txt

$ git commit -am 'b'
[master a9e140c] b
 1 file changed, 1 insertion(+), 1 deletion(-)

$ git checkout -b c 'HEAD^'
Switched to a new branch 'c'

$ echo c > file.txt

$ git commit -am 'c'
[c 80241e1] c
 1 file changed, 1 insertion(+), 1 deletion(-)

$ git push gitea master c
[...]

$ xdg-open https://..../compare/$(git rev-parse master)...$(git rev-parse c)

Visiting the compare URL with the SHA-1s of the two diverging branches shows the diff from their common ancestor to c, instead of from master to c.

This is a regression: this feature worked in 1.8.3 and stopped working in 1.9.6. It was extremely useful for viewing the diff from before and after a force-push.

I noticed that the URL syntax has three periods, and the new behavior thus matches git-diff's behavior when also using x...y (three periods - "symmetric difference"). Perhaps Gitea should support /compare/x..y (two periods) to do the same as the old behavior (direct diff from x to y)?

Originally created by @CyberShadow on GitHub (Jul 28, 2020). To reproduce: ```console $ git init repo && cd repo Initialized empty Git repository in /home/vladimir/tmp/2020-07-28/repo/.git/ $ echo a > file.txt $ git add . && git commit -m 'Initial commit' [master (root-commit) 4b97f6e] Initial commit 1 file changed, 1 insertion(+) create mode 100644 file.txt $ echo b > file.txt $ git commit -am 'b' [master a9e140c] b 1 file changed, 1 insertion(+), 1 deletion(-) $ git checkout -b c 'HEAD^' Switched to a new branch 'c' $ echo c > file.txt $ git commit -am 'c' [c 80241e1] c 1 file changed, 1 insertion(+), 1 deletion(-) $ git push gitea master c [...] $ xdg-open https://..../compare/$(git rev-parse master)...$(git rev-parse c) ``` Visiting the compare URL with the SHA-1s of the two diverging branches shows the diff from their common ancestor to c, instead of from master to c. **This is a regression**: this feature worked in 1.8.3 and stopped working in 1.9.6. It was extremely useful for viewing the diff from before and after a force-push. I noticed that the URL syntax has three periods, and the new behavior thus matches git-diff's behavior when also using x...y (three periods - "symmetric difference"). Perhaps Gitea should support /compare/x..y (two periods) to do the same as the old behavior (direct diff from x to y)?

GiteaMirror added the type/bug label 2025-11-02 06:36:11 -06:00

GiteaMirror closed this issue

2025-11-02 06:36:11 -06:00

GiteaMirror commented

2025-11-02 06:36:12 -06:00

@stale[bot] commented on GitHub (Sep 27, 2020):

This issue has been automatically marked as stale because it has not had recent activity. I am here to help clear issues left open even if solved or waiting for more insight. This issue will be closed if no further activity occurs during the next 2 weeks. If the issue is still valid just add a comment to keep it alive. Thank you for your contributions.

@stale[bot] commented on GitHub (Sep 27, 2020): This issue has been automatically marked as stale because it has not had recent activity. I am here to help clear issues left open even if solved or waiting for more insight. This issue will be closed if no further activity occurs during the next 2 weeks. If the issue is still valid just add a comment to keep it alive. Thank you for your contributions.

GiteaMirror commented

2025-11-02 06:36:12 -06:00

@CyberShadow commented on GitHub (Sep 27, 2020):

I believe this is still relevant.

@CyberShadow commented on GitHub (Sep 27, 2020): I believe this is still relevant.

GiteaMirror commented

2025-11-02 06:36:12 -06:00

@6543 commented on GitHub (Sep 27, 2020):

@CyberShadow witch gitea version do you use?

@6543 commented on GitHub (Sep 27, 2020): @CyberShadow witch gitea version do you use?

GiteaMirror commented

2025-11-02 06:36:13 -06:00

@CyberShadow commented on GitHub (Sep 27, 2020):

We are on 1.8.3 for the time being due to this issue.

@CyberShadow commented on GitHub (Sep 27, 2020): We are on 1.8.3 for the time being due to this issue.

GiteaMirror commented

2025-11-02 06:36:13 -06:00

@6543 commented on GitHub (Sep 27, 2020):

@CyberShadow your version is not supported anymore :/

there is a good chance this bug is fixed in master ... didn't test current stable release nor master jet (give me some time)

In any case It's a good choice to upgrade to 1.12.4

@6543 commented on GitHub (Sep 27, 2020): @CyberShadow your version is not supported anymore :/ there is a good chance this bug is fixed in master ... didn't test current stable release nor master jet (give me some time) In any case It's a good choice to upgrade to 1.12.4

GiteaMirror commented

2025-11-02 06:36:13 -06:00

@6543 commented on GitHub (Sep 27, 2020):

@CyberShadow fixed on master (upcomming v1.13.0): ad9e3b6de1...b93dc2ee9e

and v1.12.x too: ad9e3b6de1...b93dc2ee9e

@6543 commented on GitHub (Sep 27, 2020): @CyberShadow fixed on master (upcomming v1.13.0): https://gitea.com/6543/test_12349/compare/ad9e3b6de19a388e42483ba062d0caadb843164e...b93dc2ee9e31660708f634c58ebbdc381b9ef8f6 and v1.12.x too: https://codeberg.org/6543/test_12349/compare/ad9e3b6de19a388e42483ba062d0caadb843164e...b93dc2ee9e31660708f634c58ebbdc381b9ef8f6

GiteaMirror commented

2025-11-02 06:36:13 -06:00

@6543 commented on GitHub (Sep 27, 2020):

@CyberShadow if you have questions about upgrade feel free to ask, I'll close this issue since this wont be fixed ...

@6543 commented on GitHub (Sep 27, 2020): @CyberShadow if you have questions about upgrade feel free to ask, I'll close this issue since this wont be fixed ...

GiteaMirror commented

2025-11-02 06:36:13 -06:00

@zeripath commented on GitHub (Sep 27, 2020):

I'm gonna reopen it as I think we could support this.

@zeripath commented on GitHub (Sep 27, 2020): I'm gonna reopen it as I think we could support this.

GiteaMirror commented

2025-11-02 06:36:14 -06:00

@CyberShadow commented on GitHub (Sep 27, 2020):

@6543 No, that's the wrong result. It needs to go from b (the ref in the URL) to c, not from a (the common ancestor) to c.

Kindly reopen.

@CyberShadow commented on GitHub (Sep 27, 2020): @6543 No, that's the wrong result. It needs to go from b (the ref in the URL) to c, not from a (the common ancestor) to c. Kindly reopen.

GiteaMirror commented

2025-11-02 06:36:14 -06:00

@6543 commented on GitHub (Sep 27, 2020):

sorry then 🙃

and thanks for checking&reporting

@6543 commented on GitHub (Sep 27, 2020): sorry then 🙃 and thanks for checking&reporting

GiteaMirror commented

2025-11-02 06:36:14 -06:00

@CyberShadow commented on GitHub (Sep 27, 2020):

Worth mentioning is that GitHub follows Git's syntax convention in its URLs:

https://www.github.com/CyberShadow/gitea12349/compare/master..c <- two dots - direct compare from master to c
https://www.github.com/CyberShadow/gitea12349/compare/master...c <- three dots - compare merge-base of the two refs to c

Gitea could follow the same convention by adding the two-dot URL variant (or rather, restoring the pre-1.9 behavior with that URL syntax).

@CyberShadow commented on GitHub (Sep 27, 2020): Worth mentioning is that GitHub follows Git's syntax convention in its URLs: https://www.github.com/CyberShadow/gitea12349/compare/master..c <- two dots - direct compare from master to c https://www.github.com/CyberShadow/gitea12349/compare/master...c <- three dots - compare merge-base of the two refs to c Gitea could follow the same convention by adding the two-dot URL variant (or rather, restoring the pre-1.9 behavior with that URL syntax).

GiteaMirror commented

2025-11-02 06:36:14 -06:00

@wxiaoguang commented on GitHub (Apr 13, 2022):

It should have been done in the latest release.

@wxiaoguang commented on GitHub (Apr 13, 2022): It should have been done in the latest release.

GiteaMirror commented

2025-11-02 06:36:15 -06:00

@CyberShadow commented on GitHub (Apr 13, 2022):

Indeed, seems to work.

https://gitea.com/CyberShadow/test12349/compare/master..c
https://gitea.com/CyberShadow/test12349/compare/master...c

Thank you!

@CyberShadow commented on GitHub (Apr 13, 2022): Indeed, seems to work. https://gitea.com/CyberShadow/test12349/compare/master..c https://gitea.com/CyberShadow/test12349/compare/master...c Thank you!

Sign in to join this conversation.

Branches Tags

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/gitea#5795