From: Ray Lehtiniemi <rayl@mail.com>
To: git@vger.kernel.org
Subject: bug in "git diff -w" output?
Date: Wed, 11 Oct 2006 22:28:10 -0600 [thread overview]
Message-ID: <200610112228.10597.rayl@mail.com> (raw)
hi all
i'm not sure i understand the output of "git diff -w" in the example below.
to my eye, it seems incorrect around lines 53 and 54.
this example was done using the git version which originally introduced the -w
and -b flags to diff. the "dirty" in the version is a modified prefix in
Makefile. similar output is generated by the latest git version
1.4.3.rc2.ge19ff.
1 $ git version 1.4.1.rc1.g0d21e-dirty
2
3 $ git init-db
4 defaulting to local storage area
5 $ cat <<EOF > x
6 do {
7 nothing;
8 } while (0);
9 EOF
10 $ git add x
11 $ git commit -m "foo" x
12 Committing initial tree 30cd2f91b2797cd3b657a5a03f3e7468253d8dce
13 $ cat <<EOF > x
14 do
15 {
16 nothing;
17 }
18 while (0);
19 EOF
20 $ git diff
21 diff --git a/x b/x
22 index adf3937..64671c6 100644
23 --- a/x
24 +++ b/x
25 @@ -1,3 +1,5 @@
26 -do {
27 - nothing;
28 -} while (0);
29 +do
30 + {
31 + nothing;
32 +}
33 +while (0);
34 $ git diff -b
35 diff --git a/x b/x
36 index adf3937..64671c6 100644
37 --- a/x
38 +++ b/x
39 @@ -1,3 +1,5 @@
40 -do {
41 +do
42 + {
43 nothing;
44 -} while (0);
45 +}
46 +while (0);
47 $ git diff -w
48 diff --git a/x b/x
49 index adf3937..64671c6 100644
50 --- a/x
51 +++ b/x
52 @@ -1,3 +1,5 @@
53 do {
54 + {
55 nothing;
56 -} while (0);
57 +}
58 +while (0);
ray
reply other threads:[~2006-10-12 4:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=200610112228.10597.rayl@mail.com \
--to=rayl@mail.com \
--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.