{"thread":{"id":"51331","subject":"[PATCH] xdiff: avoid accidental redefinition of LFS feature in OpenIndiana","startedAt":"2019-06-18T06:45:42Z","lastAt":"2019-07-29T04:54:06Z","messageCount":17,"participants":["Carlo Marcelo Arenas Belón","Johannes Schindelin","Jeff King","Carlo Arenas","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"377385","messageId":"20190618064537.62369-1-carenas@gmail.com","threadId":"51331","inReplyTo":null,"subject":"[PATCH] xdiff: avoid accidental redefinition of LFS feature in OpenIndiana","fromName":"Carlo Marcelo Arenas Belón","fromEmail":"carenas@gmail.com","sentAt":"2019-06-18T06:45:37Z","receivedAt":"2019-06-18T06:45:42Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"after b46054b374 (\"xdiff: use git-compat-util\", 2019-04-11), two system\nheaders added in 2012 to xutils where no longer needed and could conflict\nas shown below:\n\nIn file included from xdiff/xinclude.h:26:0,\n from xdiff/xutils.c:25:\n./git-compat-util.h:4:0: warning: \"_FILE_OFFSET_BITS\" redefined\n #define _FILE_OFFSET_BITS 64\n\nIn file included from /usr/include/limits.h:37:0,\n from xdiff/xutils.c:23:\n/usr/include/sys/feature_tests.h:231:0: note: this is the location of the previous definition\n #define _FILE_OFFSET_BITS 32\n\nmake sure git-compat-util.h is the first header (through xinclude.h)\n\nSigned-off-by: Carlo Marcelo Arenas Belón \n---\n xdiff/xutils.c | 4 ----\n 1 file changed, 4 deletions(-)\n\ndiff --git a/xdiff/xutils.c b/xdiff/xutils.c\nindex 963e1c58b9..cfa6e2220f 100644\n--- a/xdiff/xutils.c\n+++ b/xdiff/xutils.c\n@@ -20,13 +20,9 @@\n *\n */\n \n-#include \n-#include \n #include \"xinclude.h\"\n \n \n-\n-\n long xdl_bogosqrt(long n) {\n \tlong i;\n \n-- \n2.22.0\n\n"},{"id":"377410","messageId":"nycvar.QRO.7.76.6.1906181642000.44@tvgsbejvaqbjf.bet","threadId":"51331","inReplyTo":"20190618064537.62369-1-carenas@gmail.com","subject":"Re: [PATCH] xdiff: avoid accidental redefinition of LFS feature in OpenIndiana","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-06-18T14:43:40Z","receivedAt":"2019-06-18T14:43:38Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Carlo,\n\nin the Git ecosystem, the abbreviation \"LFS\" does not mean what you think\nit means... Let's not use the abbreviation for anything else.\n\nOn Mon, 17 Jun 2019, Carlo Marcelo Arenas Belón wrote:\n\n> after b46054b374 (\"xdiff: use git-compat-util\", 2019-04-11), two system\n> headers added in 2012 to xutils where no longer needed and could conflict\n\ns/where/are/\n\nOtherwise the patch looks fine to me, thanks,\nJohannes\n\n> as shown below:\n>\n> In file included from xdiff/xinclude.h:26:0,\n> from xdiff/xutils.c:25:\n> ./git-compat-util.h:4:0: warning: \"_FILE_OFFSET_BITS\" redefined\n> #define _FILE_OFFSET_BITS 64\n>\n> In file included from /usr/include/limits.h:37:0,\n> from xdiff/xutils.c:23:\n> /usr/include/sys/feature_tests.h:231:0: note: this is the location of the previous definition\n> #define _FILE_OFFSET_BITS 32\n>\n> make sure git-compat-util.h is the first header (through xinclude.h)\n>\n> Signed-off-by: Carlo Marcelo Arenas Belón \n> ---\n> xdiff/xutils.c | 4 ----\n> 1 file changed, 4 deletions(-)\n>\n> diff --git a/xdiff/xutils.c b/xdiff/xutils.c\n> index 963e1c58b9..cfa6e2220f 100644\n> --- a/xdiff/xutils.c\n> +++ b/xdiff/xutils.c\n> @@ -20,13 +20,9 @@\n> *\n> */\n>\n> -#include \n> -#include \n> #include \"xinclude.h\"\n>\n>\n> -\n> -\n> long xdl_bogosqrt(long n) {\n> \tlong i;\n>\n> --\n> 2.22.0\n>\n>\n"},{"id":"377412","messageId":"20190618155326.GA4014@sigill.intra.peff.net","threadId":"51331","inReplyTo":"20190618064537.62369-1-carenas@gmail.com","subject":"[PATCH 0/2] a few more redundant system include cleanups","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-06-18T15:53:26Z","receivedAt":"2019-06-18T15:53:30Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Jun 17, 2019 at 11:45:37PM -0700, Carlo Marcelo Arenas Belón wrote:\n\n> after b46054b374 (\"xdiff: use git-compat-util\", 2019-04-11), two system\n> headers added in 2012 to xutils where no longer needed and could conflict\n> as shown below:\n> \n> In file included from xdiff/xinclude.h:26:0,\n> from xdiff/xutils.c:25:\n> ./git-compat-util.h:4:0: warning: \"_FILE_OFFSET_BITS\" redefined\n> #define _FILE_OFFSET_BITS 64\n> \n> In file included from /usr/include/limits.h:37:0,\n> from xdiff/xutils.c:23:\n> /usr/include/sys/feature_tests.h:231:0: note: this is the location of the previous definition\n> #define _FILE_OFFSET_BITS 32\n> \n> make sure git-compat-util.h is the first header (through xinclude.h)\n\nThanks, this looks good to me. I fixed the system headers in xinclude.h,\nbut didn't think to check for individual C files including them.\n\nI did a quick grep for similar cases, and didn't find any that I think\nwould be problematic. There were a few cleanups, below.\n\nThere are still some other system includes, but they are mostly one-offs\nthat we wouldn't expect git-compat-util to cover (e.g., threading stuff\nin thread-utils.[ch], openssl stuff in hash.h). So I think with your\npatch, plus the patches below, there's nothing left to clean up.\n\n [1/2]: verify-tag: drop signal.h include\n [2/2]: wt-status.h: drop stdio.h include\n\n builtin/verify-commit.c | 1 -\n builtin/verify-tag.c | 1 -\n wt-status.h | 1 -\n 3 files changed, 3 deletions(-)\n\n-Peff\n"},{"id":"377413","messageId":"20190618155409.GA13431@sigill.intra.peff.net","threadId":"51331","inReplyTo":"20190618155326.GA4014@sigill.intra.peff.net","subject":"[PATCH 1/2] verify-tag: drop signal.h include","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-06-18T15:54:09Z","receivedAt":"2019-06-18T15:54:16Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"There's no reason verify-tag.c needs to include signal.h. It's already\nin git-compat-util.h, which we properly include as the first header.\nAnd there doesn't seem to be a particular reason for this include; it's\njust an artifact from the file creation in 2ae68fcb78 (Make verify-tag a\nbuiltin., 2007-07-27).\n\nLikewise verify-commit.c has the same issue, probably because it was\ncreated using verify-tag as a template in d07b00b7f3 (verify-commit:\nscriptable commit signature verification, 2014-06-23).\n\nThese includes are probably just redundant, and not hurting anything by\ncircumventing the order that git-compat-util.h tries to impose, since\nwe'll always have loaded git-compat-util by the time we get to these. So\nthis is just a cleanup, and shouldn't fix or break any platforms.\n\nSigned-off-by: Jeff King \n---\n builtin/verify-commit.c | 1 -\n builtin/verify-tag.c | 1 -\n 2 files changed, 2 deletions(-)\n\ndiff --git a/builtin/verify-commit.c b/builtin/verify-commit.c\nindex 4b9e823f8f..40c69a0bed 100644\n--- a/builtin/verify-commit.c\n+++ b/builtin/verify-commit.c\n@@ -12,7 +12,6 @@\n #include \"repository.h\"\n #include \"commit.h\"\n #include \"run-command.h\"\n-#include \n #include \"parse-options.h\"\n #include \"gpg-interface.h\"\n \ndiff --git a/builtin/verify-tag.c b/builtin/verify-tag.c\nindex 6fa04b751a..f45136a06b 100644\n--- a/builtin/verify-tag.c\n+++ b/builtin/verify-tag.c\n@@ -10,7 +10,6 @@\n #include \"builtin.h\"\n #include \"tag.h\"\n #include \"run-command.h\"\n-#include \n #include \"parse-options.h\"\n #include \"gpg-interface.h\"\n #include \"ref-filter.h\"\n-- \n2.22.0.rc3.685.g5185838c9a\n\n"},{"id":"377414","messageId":"20190618155419.GB13431@sigill.intra.peff.net","threadId":"51331","inReplyTo":"20190618155326.GA4014@sigill.intra.peff.net","subject":"[PATCH 2/2] wt-status.h: drop stdio.h include","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-06-18T15:54:19Z","receivedAt":"2019-06-18T15:54:23Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"We started including stdio.h to pick up the declaration of \"FILE\" in\nf26a001226 (Enable wt-status output to a given FILE pointer.,\n2007-09-17). But there's no need, since headers can assume that\ngit-compat-util.h has been included, which covers stdio.\n\nThis should just be redundant, and not hurting anything (like pulling in\nincludes out of order) because C files are supposed to always include\ngit-compat-util.h first. But it's worth cleaning up to model good\nbehavior.\n\nSigned-off-by: Jeff King \n---\n wt-status.h | 1 -\n 1 file changed, 1 deletion(-)\n\ndiff --git a/wt-status.h b/wt-status.h\nindex 64f1ddc9fd..8849768e92 100644\n--- a/wt-status.h\n+++ b/wt-status.h\n@@ -1,7 +1,6 @@\n #ifndef STATUS_H\n #define STATUS_H\n \n-#include \n #include \"string-list.h\"\n #include \"color.h\"\n #include \"pathspec.h\"\n-- \n2.22.0.rc3.685.g5185838c9a\n"},{"id":"377490","messageId":"CAPUEspgRnGd4nT3yd2YTGMt8t4qQ=V3GGNeTih3cmjnZHNextw@mail.gmail.com","threadId":"51331","inReplyTo":"20190618155326.GA4014@sigill.intra.peff.net","subject":"Re: [PATCH 0/2] a few more redundant system include cleanups","fromName":"Carlo Arenas","fromEmail":"carenas@gmail.com","sentAt":"2019-06-19T09:12:30Z","receivedAt":"2019-06-19T09:12:43Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"On Tue, Jun 18, 2019 at 8:53 AM Jeff King wrote:\n>\n> Thanks, this looks good to me. I fixed the system headers in xinclude.h,\n> but didn't think to check for individual C files including them.\n\nalso noticed that after the refactoring some files will include a couple\nof headers twice (not an issue, though thanks to the header guards)\nbut didn't send that patch to reduce the churn and avoid confusion.\n\n> I did a quick grep for similar cases, and didn't find any that I think\n> would be problematic. There were a few cleanups, below.\n\nwould you mind if I add your 2 patches to a series and include that\nmissing one?, that way I'll also have a chance to write a better commit\nmessage from my original change, including the other feedback I got\nas well\n\nCarlo\n\nPS. is there a recommendation on how to version a patch that move\ninto a series that would be preferred?\n"},{"id":"377544","messageId":"20190619174841.GB27834@sigill.intra.peff.net","threadId":"51331","inReplyTo":"CAPUEspgRnGd4nT3yd2YTGMt8t4qQ=V3GGNeTih3cmjnZHNextw@mail.gmail.com","subject":"Re: [PATCH 0/2] a few more redundant system include cleanups","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-06-19T17:48:41Z","receivedAt":"2019-06-19T17:48:44Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jun 19, 2019 at 02:12:30AM -0700, Carlo Arenas wrote:\n\n> > I did a quick grep for similar cases, and didn't find any that I think\n> > would be problematic. There were a few cleanups, below.\n> \n> would you mind if I add your 2 patches to a series and include that\n> missing one?, that way I'll also have a chance to write a better commit\n> message from my original change, including the other feedback I got\n> as well\n\nThat's be fine with me. Thanks.\n\n> PS. is there a recommendation on how to version a patch that move\n> into a series that would be preferred?\n\nI think you can just say \"v2\" on the whole thing, include all three\npatches, and then write a note that the series supersedes what I sent.\n\n-Peff\n"},{"id":"378563","messageId":"xmqqtvc3ymux.fsf@gitster-ct.c.googlers.com","threadId":"51331","inReplyTo":"20190619174841.GB27834@sigill.intra.peff.net","subject":"Re: [PATCH 0/2] a few more redundant system include cleanups","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-07-03T18:49:42Z","receivedAt":"2019-07-03T18:49:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Wed, Jun 19, 2019 at 02:12:30AM -0700, Carlo Arenas wrote:\n>\n>> > I did a quick grep for similar cases, and didn't find any that I think\n>> > would be problematic. There were a few cleanups, below.\n>> \n>> would you mind if I add your 2 patches to a series and include that\n>> missing one?, that way I'll also have a chance to write a better commit\n>> message from my original change, including the other feedback I got\n>> as well\n>\n> That's be fine with me. Thanks.\n>\n>> PS. is there a recommendation on how to version a patch that move\n>> into a series that would be preferred?\n>\n> I think you can just say \"v2\" on the whole thing, include all three\n> patches, and then write a note that the series supersedes what I sent.\n\nCarlo, no need to rush, but has this happened already? I do not\nrecall seeing an update, and I am wondering if I missed one.\n\nThanks.\n\n\n\n\n"},{"id":"378577","messageId":"CAPUEspjp3WkHk376hu5EvvyufGYQCSHKM6cTT3hnQyfNgpnLzg@mail.gmail.com","threadId":"51331","inReplyTo":"xmqqtvc3ymux.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH 0/2] a few more redundant system include cleanups","fromName":"Carlo Arenas","fromEmail":"carenas@gmail.com","sentAt":"2019-07-04T05:11:52Z","receivedAt":"2019-07-04T05:13:18Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"On Wed, Jul 3, 2019 at 11:49 AM Junio C Hamano wrote:\n>\n> Carlo, no need to rush, but has this happened already? I do not\n> recall seeing an update, and I am wondering if I missed one.\n\nJunio; had yet to send the update, so nothing was missed\n\nCarlo\n"},{"id":"379442","messageId":"20190728200724.35630-1-carenas@gmail.com","threadId":"51331","inReplyTo":"CAPUEspjp3WkHk376hu5EvvyufGYQCSHKM6cTT3hnQyfNgpnLzg@mail.gmail.com","subject":"[PATCH v2 0/5] system header cleanup","fromName":"Carlo Marcelo Arenas Belón","fromEmail":"carenas@gmail.com","sentAt":"2019-07-28T20:07:19Z","receivedAt":"2019-07-28T20:07:29Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"This series is a reroll of jk/no-system-includes-in-dot-c with\ncb/xdiff-no-system-includes-in-dot-c applied on top with minor\nfixes for the commit message based on feedback from Johannes\nand the example put forward by Peff with his own patches.\n\nThe changes proposed shouldn't affect any systems (except for\nthe 3rd one) and that has since shown to also be needed\nin Alpine Linux (because of _XOPEN_SOURCE redefinition).\n\nThe last 2 patches are new to the series and just cleanup\nthe dependency list in xdiff.\n\nCarlo Marcelo Arenas Belón (3):\n xdiff: drop system includes in xutils.c\n xdiff: remove duplicate headers from xhistogram.c\n xdiff: remove duplicate headers from xpatience.c\n\nJeff King (2):\n verify-tag: drop signal.h include\n wt-status.h: drop stdio.h include\n\n builtin/verify-commit.c | 1 -\n builtin/verify-tag.c | 1 -\n wt-status.h | 1 -\n xdiff/xhistogram.c | 2 --\n xdiff/xpatience.c | 2 --\n xdiff/xutils.c | 4 ----\n 6 files changed, 11 deletions(-)\n\n-- \n2.22.0\n"},{"id":"379443","messageId":"20190728200724.35630-2-carenas@gmail.com","threadId":"51331","inReplyTo":"20190728200724.35630-1-carenas@gmail.com","subject":"[PATCH v2 1/5] verify-tag: drop signal.h include","fromName":"Carlo Marcelo Arenas Belón","fromEmail":"carenas@gmail.com","sentAt":"2019-07-28T20:07:20Z","receivedAt":"2019-07-28T20:07:31Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"From: Jeff King \n\nThere's no reason verify-tag.c needs to include signal.h. It's already\nin git-compat-util.h, which we properly include as the first header.\nAnd there doesn't seem to be a particular reason for this include; it's\njust an artifact from the file creation in 2ae68fcb78 (Make verify-tag a\nbuiltin., 2007-07-27).\n\nLikewise verify-commit.c has the same issue, probably because it was\ncreated using verify-tag as a template in d07b00b7f3 (verify-commit:\nscriptable commit signature verification, 2014-06-23).\n\nThese includes are probably just redundant, and not hurting anything by\ncircumventing the order that git-compat-util.h tries to impose, since\nwe'll always have loaded git-compat-util by the time we get to these. So\nthis is just a cleanup, and shouldn't fix or break any platforms.\n\nSigned-off-by: Jeff King \nSigned-off-by: Junio C Hamano \n---\n builtin/verify-commit.c | 1 -\n builtin/verify-tag.c | 1 -\n 2 files changed, 2 deletions(-)\n\ndiff --git a/builtin/verify-commit.c b/builtin/verify-commit.c\nindex 7772c07ed7..4e93914e59 100644\n--- a/builtin/verify-commit.c\n+++ b/builtin/verify-commit.c\n@@ -12,7 +12,6 @@\n #include \"repository.h\"\n #include \"commit.h\"\n #include \"run-command.h\"\n-#include \n #include \"parse-options.h\"\n #include \"gpg-interface.h\"\n \ndiff --git a/builtin/verify-tag.c b/builtin/verify-tag.c\nindex 6fa04b751a..f45136a06b 100644\n--- a/builtin/verify-tag.c\n+++ b/builtin/verify-tag.c\n@@ -10,7 +10,6 @@\n #include \"builtin.h\"\n #include \"tag.h\"\n #include \"run-command.h\"\n-#include \n #include \"parse-options.h\"\n #include \"gpg-interface.h\"\n #include \"ref-filter.h\"\n-- \n2.22.0\n\n"},{"id":"379444","messageId":"20190728200724.35630-3-carenas@gmail.com","threadId":"51331","inReplyTo":"20190728200724.35630-1-carenas@gmail.com","subject":"[PATCH v2 2/5] wt-status.h: drop stdio.h include","fromName":"Carlo Marcelo Arenas Belón","fromEmail":"carenas@gmail.com","sentAt":"2019-07-28T20:07:21Z","receivedAt":"2019-07-28T20:07:31Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"From: Jeff King \n\nWe started including stdio.h to pick up the declaration of \"FILE\" in\nf26a001226 (Enable wt-status output to a given FILE pointer.,\n2007-09-17). But there's no need, since headers can assume that\ngit-compat-util.h has been included, which covers stdio.\n\nThis should just be redundant, and not hurting anything (like pulling in\nincludes out of order) because C files are supposed to always include\ngit-compat-util.h first. But it's worth cleaning up to model good\nbehavior.\n\nSigned-off-by: Jeff King \nSigned-off-by: Junio C Hamano \n---\n wt-status.h | 1 -\n 1 file changed, 1 deletion(-)\n\ndiff --git a/wt-status.h b/wt-status.h\nindex 64f1ddc9fd..8849768e92 100644\n--- a/wt-status.h\n+++ b/wt-status.h\n@@ -1,7 +1,6 @@\n #ifndef STATUS_H\n #define STATUS_H\n \n-#include \n #include \"string-list.h\"\n #include \"color.h\"\n #include \"pathspec.h\"\n-- \n2.22.0\n\n"},{"id":"379445","messageId":"20190728200724.35630-4-carenas@gmail.com","threadId":"51331","inReplyTo":"20190728200724.35630-1-carenas@gmail.com","subject":"[PATCH v2 3/5] xdiff: drop system includes in xutils.c","fromName":"Carlo Marcelo Arenas Belón","fromEmail":"carenas@gmail.com","sentAt":"2019-07-28T20:07:22Z","receivedAt":"2019-07-28T20:07:34Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"After b46054b374 (\"xdiff: use git-compat-util\", 2019-04-11), two system\nheaders added with 6942efcfa9 (\"xdiff: load full words in the inner loop\nof xdl_hash_record\", 2012-04-06) to xutils.c are no longer needed and\ncould conflict as shown below from an OpenIndiana build:\n\nIn file included from xdiff/xinclude.h:26:0,\n from xdiff/xutils.c:25:\n./git-compat-util.h:4:0: warning: \"_FILE_OFFSET_BITS\" redefined\n #define _FILE_OFFSET_BITS 64\n\nIn file included from /usr/include/limits.h:37:0,\n from xdiff/xutils.c:23:\n/usr/include/sys/feature_tests.h:231:0: note: this is the location of the previous definition\n #define _FILE_OFFSET_BITS 32\n\nMake sure git-compat-util.h is the first header (through xinclude.h)\n\nSigned-off-by: Carlo Marcelo Arenas Belón \nSigned-off-by: Junio C Hamano \n---\nV2: reword commit with feedback from Johannes\n\n xdiff/xutils.c | 4 ----\n 1 file changed, 4 deletions(-)\n\ndiff --git a/xdiff/xutils.c b/xdiff/xutils.c\nindex 963e1c58b9..cfa6e2220f 100644\n--- a/xdiff/xutils.c\n+++ b/xdiff/xutils.c\n@@ -20,13 +20,9 @@\n *\n */\n \n-#include \n-#include \n #include \"xinclude.h\"\n \n \n-\n-\n long xdl_bogosqrt(long n) {\n \tlong i;\n \n-- \n2.22.0\n\n"},{"id":"379446","messageId":"20190728200724.35630-6-carenas@gmail.com","threadId":"51331","inReplyTo":"20190728200724.35630-1-carenas@gmail.com","subject":"[PATCH v2 5/5] xdiff: remove duplicate headers from xpatience.c","fromName":"Carlo Marcelo Arenas Belón","fromEmail":"carenas@gmail.com","sentAt":"2019-07-28T20:07:24Z","receivedAt":"2019-07-28T20:07:34Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"92b7de93fb (Implement the patience diff algorithm, 2009-01-07) added them\nbut were already part of xinclude.h\n\nSigned-off-by: Carlo Marcelo Arenas Belón \n---\n xdiff/xpatience.c | 2 --\n 1 file changed, 2 deletions(-)\n\ndiff --git a/xdiff/xpatience.c b/xdiff/xpatience.c\nindex f3573d9f00..3c5601b602 100644\n--- a/xdiff/xpatience.c\n+++ b/xdiff/xpatience.c\n@@ -20,8 +20,6 @@\n *\n */\n #include \"xinclude.h\"\n-#include \"xtypes.h\"\n-#include \"xdiff.h\"\n \n /*\n * The basic idea of patience diff is to find lines that are unique in\n-- \n2.22.0\n\n"},{"id":"379447","messageId":"20190728200724.35630-5-carenas@gmail.com","threadId":"51331","inReplyTo":"20190728200724.35630-1-carenas@gmail.com","subject":"[PATCH v2 4/5] xdiff: remove duplicate headers from xhistogram.c","fromName":"Carlo Marcelo Arenas Belón","fromEmail":"carenas@gmail.com","sentAt":"2019-07-28T20:07:23Z","receivedAt":"2019-07-28T20:07:35Z","isPatch":true,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"8c912eea94 (\"teach --histogram to diff\", 2011-07-12) included them, but\nwere already part of xinclude.h\n\nSigned-off-by: Carlo Marcelo Arenas Belón \n---\n xdiff/xhistogram.c | 2 --\n 1 file changed, 2 deletions(-)\n\ndiff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c\nindex ec85f5992b..c7b35a9667 100644\n--- a/xdiff/xhistogram.c\n+++ b/xdiff/xhistogram.c\n@@ -42,8 +42,6 @@\n */\n \n #include \"xinclude.h\"\n-#include \"xtypes.h\"\n-#include \"xdiff.h\"\n \n #define MAX_PTR\tUINT_MAX\n #define MAX_CNT\tUINT_MAX\n-- \n2.22.0\n\n"},{"id":"379452","messageId":"20190728221904.GA21379@sigill.intra.peff.net","threadId":"51331","inReplyTo":"20190728200724.35630-1-carenas@gmail.com","subject":"Re: [PATCH v2 0/5] system header cleanup","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-07-28T22:19:05Z","receivedAt":"2019-07-28T22:19:07Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Jul 28, 2019 at 01:07:19PM -0700, Carlo Marcelo Arenas Belón wrote:\n\n> This series is a reroll of jk/no-system-includes-in-dot-c with\n> cb/xdiff-no-system-includes-in-dot-c applied on top with minor\n> fixes for the commit message based on feedback from Johannes\n> and the example put forward by Peff with his own patches.\n> \n> The changes proposed shouldn't affect any systems (except for\n> the 3rd one) and that has since shown to also be needed\n> in Alpine Linux (because of _XOPEN_SOURCE redefinition).\n> \n> The last 2 patches are new to the series and just cleanup\n> the dependency list in xdiff.\n\nThanks, these all look good to me.\n\n-Peff\n"},{"id":"379468","messageId":"xmqqmugxl9uf.fsf@gitster-ct.c.googlers.com","threadId":"51331","inReplyTo":"20190728221904.GA21379@sigill.intra.peff.net","subject":"Re: [PATCH v2 0/5] system header cleanup","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-07-29T04:54:00Z","receivedAt":"2019-07-29T04:54:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Sun, Jul 28, 2019 at 01:07:19PM -0700, Carlo Marcelo Arenas Belón wrote:\n>\n>> This series is a reroll of jk/no-system-includes-in-dot-c with\n>> cb/xdiff-no-system-includes-in-dot-c applied on top with minor\n>> fixes for the commit message based on feedback from Johannes\n>> and the example put forward by Peff with his own patches.\n>> \n>> The changes proposed shouldn't affect any systems (except for\n>> the 3rd one) and that has since shown to also be needed\n>> in Alpine Linux (because of _XOPEN_SOURCE redefinition).\n>> \n>> The last 2 patches are new to the series and just cleanup\n>> the dependency list in xdiff.\n>\n> Thanks, these all look good to me.\n\nThanks, both. They look good to me too.\n"}]}