search

MightyCreak / diffuse

Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.
http://mightycreak.github.io/diffuse/
GNU General Public License v2.0
265 stars 45 forks source link

VCS integration is broken #120

Closed UffeJakobsen closed 2 years ago

UffeJakobsen commented 2 years ago

VCS integration is broken with the new changes

Place your current dir inside a git repo (the diffuse git repo itself will do) Try these commands:

diffuse -c HEAD
diffuse -c some-sha-from-the-repo

None of the above commands work anymore - I wonder if the new release was a bit too quick - unfortunately the release have already been picked up by some distributions (ArchLinux etc)

MightyCreak commented 2 years ago

Thanks, I'll watch that!

Are you testing with v0.7.2 or master?

MightyCreak commented 2 years ago

Ok well, it seems I have inadvertently fixed the bug by cleaning the code even more :sweat_smile:

It doesn't work on 0.7.2, but it does work on master.

I'll clean a bit more stuff and push a 0.7.3 later.

UffeJakobsen commented 2 years ago

Well I was testing both the master and 0.7.2 - and none of them did work at the time... Will pull master and try again...

UffeJakobsen commented 2 years ago

I tried master and while diffuse -c some-git-sha does seem to work

diffuse -c HEAD does still not work

MightyCreak commented 2 years ago

When you say it doesn't work, what do you expect it to do?

Because I thought it didn't work until I discovered that HEAD was a merge commit (i.e. no file changed).

If you run git checkout some-git-sha and diffuse -c HEAD, you should get the same result as diffuse -c some-git-sha (that's what I have locally at least)

UffeJakobsen commented 2 years ago

Ah I did not notice that HEAD was a merge commit either... :-)

UffeJakobsen commented 2 years ago

I think that this bug can be closed the the changes done for 0.7.3 :-)

MightyCreak commented 2 years ago

Cool!

That said, maybe it would be nice to have a dialog window saying that no files were changed in the given commit.. would be a nice enhancement.

UffeJakobsen commented 2 years ago

Yes, that would be a really nice feature :-)

MightyCreak commented 2 years ago

Bug fixed in v0.7.3! :tada: