From: Peter Oberndorfer <kumbayo84@arcor.de>
To: git@vger.kernel.org
Subject: Ignoring boring lines(that do not contain information) in git diff
Date: Mon, 08 Oct 2012 18:44:12 +0200 [thread overview]
Message-ID: <507302DC.4030207@arcor.de> (raw)
[-- 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
next reply other threads:[~2012-10-08 16:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-08 16:44 Peter Oberndorfer [this message]
2012-11-26 20:35 ` Ignoring boring lines(that do not contain information) in git diff Peter Oberndorfer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=507302DC.4030207@arcor.de \
--to=kumbayo84@arcor.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.