git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* Ignoring boring lines(that do not contain information) in git diff
@ 2012-10-08 16:44 Peter Oberndorfer
  2012-11-26 20:35 ` Peter Oberndorfer
  0 siblings, 1 reply; 2+ messages in thread
From: Peter Oberndorfer @ 2012-10-08 16:44 UTC (permalink / raw)
  To: git

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

Hi,

is there a way to tell git diff about lines that are uninteresting?
I mean lines which do not contain a lot of information and
appear several times in pre and post image.

For example whitespace or language dependent stuff like.
{
}
END_IF;
END_FOR;
end sub

I have seen diffs that containing 2 interesting hunks splitted by such 
boring lines.
(I have attached a anonymized version of a real world example where this 
happens)

I think the diff would be clearer when this boring line was added to the 
surrounding hunks.
I already tried patience diff but in my test case it changed nothing.
I am using git 1.7.10.

Thanks,
Greetings Peter



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: example_diff_boring_split.diff --]
[-- Type: text/x-diff; name="example_diff_boring_split.diff", Size: 862 bytes --]

diff --git a/Source/Frobble/Blabber.txt b/Source/Frobble/Blabber.txt
index 87ccddb..627bc3e 100644
--- a/Source/Frobble/Blabber.txt
+++ b/Source/Frobble/Blabber.txt
@@ -138,73 +138,74 @@ END_VAR
-         //frobble immediately if immediately flag is set
-         IF bImmediately AND NOT Array[i].bDisabled THEN
-            aFrobble(i, Entry);
+         IF Entry.bBlah THEN
+               Alarm.Alarm  := SomeAlarm;
+         ELSE
+               Alarm := Entry;
          END_IF;
          
-         // signal if frobble count has changed
-         iChanged := iChanged + 1;
-         EXIT;
+         IF Array[i].Alarm = Alarm THEN
+            //do not brabble if alarm is gobbled
+               EXIT;
+         END_IF;
       END_IF;
-   END_FOR;
-ELSE
-   aExample(Name := 'aaa',
-            ID1 := 1);
-END_IF;
+   ELSE
+      //entry not found, adding

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Ignoring boring lines(that do not contain information) in git diff
  2012-10-08 16:44 Ignoring boring lines(that do not contain information) in git diff Peter Oberndorfer
@ 2012-11-26 20:35 ` Peter Oberndorfer
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Oberndorfer @ 2012-11-26 20:35 UTC (permalink / raw)
  To: git

On 2012-10-08 18:44, Peter Oberndorfer wrote:
> Hi,
>
> is there a way to tell git diff about lines that are uninteresting?
> I mean lines which do not contain a lot of information and
> appear several times in pre and post image.
>
> For example whitespace or language dependent stuff like.
> {
> }
> END_IF;
> END_FOR;
> end sub
>
> I have seen diffs that containing 2 interesting hunks splitted by such boring lines.
> (I have attached a anonymized version of a real world example where this happens)
>
> I think the diff would be clearer when this boring line was added to the surrounding hunks.
> I already tried patience diff but in my test case it changed nothing.
> I am using git 1.7.10.
>

Hi,

does anybody have a idea if this is possible?
Or some comments if they would find such a feature useful?

Greetings Peter


example_diff_boring_split.diff

diff --git a/Source/Frobble/Blabber.txt b/Source/Frobble/Blabber.txt
index 87ccddb..627bc3e 100644
--- a/Source/Frobble/Blabber.txt
+++ b/Source/Frobble/Blabber.txt
@@ -138,73 +138,74 @@ END_VAR
-         //frobble immediately if immediately flag is set
-         IF bImmediately AND NOT Array[i].bDisabled THEN
-            aFrobble(i, Entry);
+         IF Entry.bBlah THEN
+               Alarm.Alarm  := SomeAlarm;
+         ELSE
+               Alarm := Entry;
          END_IF;
-         // signal if frobble count has changed
-         iChanged := iChanged + 1;
-         EXIT;
+         IF Array[i].Alarm = Alarm THEN
+            //do not brabble if alarm is gobbled
+               EXIT;
+         END_IF;
       END_IF;
-   END_FOR;
-ELSE
-   aExample(Name := 'aaa',
-            ID1 := 1);
-END_IF;
+   ELSE
+      //entry not found, adding

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-11-26 20:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-08 16:44 Ignoring boring lines(that do not contain information) in git diff Peter Oberndorfer
2012-11-26 20:35 ` Peter Oberndorfer

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).