From mboxrd@z Thu Jan 1 00:00:00 1970 From: me@tobin.cc (Tobin C. Harding) Date: Mon, 13 Mar 2017 17:57:14 +1100 Subject: diff Message-ID: <20170313065714.GA654@eros> To: kernelnewbies@lists.kernelnewbies.org List-Id: kernelnewbies.lists.kernelnewbies.org On occasions diff output does not render the same as it does when editing a file. For example, while removing checkpatch tab warning the following diff was generated -#define KS_WLAN_SET_WPS_ENABLE SIOCIWFIRSTPRIV + 4 -#define KS_WLAN_GET_WPS_ENABLE SIOCIWFIRSTPRIV + 5 +#define KS_WLAN_SET_WPS_ENABLE SIOCIWFIRSTPRIV + 4 +#define KS_WLAN_GET_WPS_ENABLE SIOCIWFIRSTPRIV + 5 However when editing the file the alignment was not changed, just tabs were inserted instead of spaces. I had the same thing happen a few days ago (reproduced here from memory) -static void foo(struct bar *barp, struct baz *bazp) +static void foo(struct bar *barp, + struct baz *bazp) { ... When editing the file the two s's in struct were aligned but not in the diff output. I reapplied this patch to a clean tree and it applied correctly. How do maintainers visually parse this if the output is not identical in the diff and the file once applied? thanks, Tobin.