After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 679666 - Improve git diff output for vala files
Improve git diff output for vala files
Status: RESOLVED FIXED
Product: gnome-boxes
Classification: Applications
Component: general
unspecified
Other All
: Normal normal
: --
Assigned To: GNOME Boxes maintainer(s)
GNOME Boxes maintainer(s)
Depends on:
Blocks:
 
 
Reported: 2012-07-10 08:22 UTC by Christophe Fergeau
Modified: 2016-03-31 13:59 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
Improve git diff output for vala files (693 bytes, patch)
2012-07-10 08:22 UTC, Christophe Fergeau 		accepted-commit_now Details | Review
Improve git diff output for vala files (820 bytes, patch)
2012-07-10 14:01 UTC, Christophe Fergeau 		committed Details | Review

Description Christophe Fergeau 2012-07-10 08:22:36 UTC 
Telling git than .vala files should be diff'ed as if they are
java files makes the output more readable since the current method
name appears in the hunk header.
Comment 1 Christophe Fergeau 2012-07-10 08:22:38 UTC 
Created attachment 218401 [details] [review]
Improve git diff output for vala files
Comment 2 Marc-Andre Lureau 2012-07-10 10:17:05 UTC 
Review of attachment 218401 [details] [review]:

yup, that's what I proposed the other day
Comment 3 Marc-Andre Lureau 2012-07-10 10:18:05 UTC 
it's worth noting in the commit log that csharp diff style is broken, even with csharp code...
Comment 4 Christophe Fergeau 2012-07-10 11:37:41 UTC 
(In reply to comment #2)
> Review of attachment 218401 [details] [review]:
> 
> yup, that's what I proposed the other day

Yes it is, I've tested it since then, and have become annoyed at the suboptimal diffs in bugzilla. I can put you as the author of this patch if you prefer.
Comment 5 Marc-Andre Lureau 2012-07-10 11:48:15 UTC 
(In reply to comment #4)

> Yes it is, I've tested it since then, and have become annoyed at the suboptimal
> diffs in bugzilla. I can put you as the author of this patch if you prefer.

nw, along with the comment about csharp, suggested by would be welcome.
Comment 6 Christophe Fergeau 2012-07-10 14:01:03 UTC 
Created attachment 218419 [details] [review]
Improve git diff output for vala files

Telling git than .vala files should be diff'ed as if they are
java files makes the output more readable since the current method
name appears in the hunk header. For some reason, using diff=csharp
gives worse results than diff=java, that's why the latter is used.
Comment 7 Marc-Andre Lureau 2012-07-10 15:14:16 UTC 
Review of attachment 218419 [details] [review]:

ack, thanks
Comment 8 Christophe Fergeau 2012-07-10 15:22:56 UTC 
Attachment 218419 [details] pushed as a1c7ae2 - Improve git diff output for vala files