{"thread":{"id":"5897","subject":"bug in \"git diff -w\" output?","startedAt":"2006-10-12T04:28:10Z","lastAt":"2006-10-12T04:28:10Z","messageCount":1,"participants":["Ray Lehtiniemi"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"28654","messageId":"200610112228.10597.rayl@mail.com","threadId":"5897","inReplyTo":null,"subject":"bug in \"git diff -w\" output?","fromName":"Ray Lehtiniemi","fromEmail":"rayl@mail.com","sentAt":"2006-10-12T04:28:10Z","receivedAt":"2006-10-12T04:28:10Z","isPatch":false,"sender":{"key":"rayl@mail.com","avatar":null},"body":"\nhi all\n\ni'm not sure i understand the output of \"git diff -w\" in the example below.  \nto my eye, it seems incorrect around lines 53 and 54.\n\nthis example was done using the git version which originally introduced the -w \nand -b flags to diff.  the \"dirty\" in the version is a modified prefix in \nMakefile. similar output is generated by the latest git version \n1.4.3.rc2.ge19ff.\n\n     1\t$ git version 1.4.1.rc1.g0d21e-dirty\n     2\t\n     3\t$ git init-db\n     4\tdefaulting to local storage area\n\n     5\t$ cat <<EOF > x\n     6\tdo {\n     7\t   nothing;\n     8\t} while (0);\n     9\tEOF\n\n    10\t$ git add x\n    11\t$ git commit -m \"foo\" x\n    12\tCommitting initial tree 30cd2f91b2797cd3b657a5a03f3e7468253d8dce\n\n    13\t$ cat <<EOF > x\n    14\tdo\n    15\t  {\n    16\t     nothing;\n    17\t}\n    18\twhile (0);\n    19\tEOF\n\n    20\t$ git diff\n    21\tdiff --git a/x b/x\n    22\tindex adf3937..64671c6 100644\n    23\t--- a/x\n    24\t+++ b/x\n    25\t@@ -1,3 +1,5 @@\n    26\t-do {\n    27\t-   nothing;\n    28\t-} while (0);\n    29\t+do\n    30\t+  {\n    31\t+     nothing;\n    32\t+}\n    33\t+while (0);\n\n    34\t$ git diff -b\n    35\tdiff --git a/x b/x\n    36\tindex adf3937..64671c6 100644\n    37\t--- a/x\n    38\t+++ b/x\n    39\t@@ -1,3 +1,5 @@\n    40\t-do {\n    41\t+do\n    42\t+  {\n    43\t    nothing;\n    44\t-} while (0);\n    45\t+}\n    46\t+while (0);\n\n    47\t$ git diff -w\n    48\tdiff --git a/x b/x\n    49\tindex adf3937..64671c6 100644\n    50\t--- a/x\n    51\t+++ b/x\n    52\t@@ -1,3 +1,5 @@\n    53\t do {\n    54\t+  {\n    55\t    nothing;\n    56\t-} while (0);\n    57\t+}\n    58\t+while (0);\n\n\nray\n"}]}