{"thread":{"id":"2363","subject":"What's in git.git tonight","startedAt":"2005-11-06T10:00:28Z","lastAt":"2005-11-06T21:07:45Z","messageCount":10,"participants":["Junio C Hamano","Randal L. Schwartz","Paul Collins","Marco Roeland","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"11193","messageId":"7v3bmayu2r.fsf@assigned-by-dhcp.cox.net","threadId":"2363","inReplyTo":null,"subject":"What's in git.git tonight","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-06T10:00:28Z","receivedAt":"2005-11-06T10:00:28Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the things merged to \"master\" so far:\n\n - The first part of the http-push over DAV; git-push frontend\n is not aware of it yet; interested people please try it out\n with git-http-push and send thanks-it-works messages to Nick.\n\n - Overriding CFLAGS from make command line did not quite work\n if you were on a platform that needed to acquire platform\n specific defines from the Makefile. Hopefully this has been\n fixed.\n\n - My attempt to split the Debian binary package into multiple\n ones.\n\n - Some documentation fixes.\n\n - A fix to format-patch.\n\nIn the proposed updates branch:\n\n - svnimport fixes from Yaacov; svnimport users please either\n Ack or report regression.\n\n - 'git binary directory' changes, started by Linus. I am\n running with gitdir != bindir configuration on my machine and\n it seems to work, but I'd want wider audience to test this.\n Note that the Debian binary packages have not been adjusted\n for this change yet.\n\n - A 'git clone' change to fully populate remotes/origin; this\n is more or less an RFC item; likes? dislikes?\n\n - A change to git-push to allow push-over-http-DAV. I'd like\n to push this part out after I hear success stories from\n people on the first half.\n\nI plan to do a 0.99.9e Sunday night with the tip of \"master\"\n(wherever it will be by that time).\n"},{"id":"11195","messageId":"86acgiujuk.fsf@blue.stonehenge.com","threadId":"2363","inReplyTo":"7v3bmayu2r.fsf@assigned-by-dhcp.cox.net","subject":"Re: What's in git.git tonight","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2005-11-06T10:54:59Z","receivedAt":"2005-11-06T10:54:59Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":"\nhttp-push.c no longer compiles on OSX:\n\ngcc -o http-push.o -c -g -O2 -Wall -DSHA1_HEADER='' http-push.c\nhttp-push.c:10:19: error: expat.h: No such file or directory\nhttp-push.c:1113: warning: type defaults to 'int' in declaration of 'XML_Char'\nhttp-push.c:1113: error: parse error before '*' token\nhttp-push.c: In function 'activelock_cdata':\nhttp-push.c:1115: error: 'userData' undeclared (first use in this function)\nhttp-push.c:1115: error: (Each undeclared identifier is reported only once\nhttp-push.c:1115: error: for each function it appears in.)\nhttp-push.c:1116: error: 'len' undeclared (first use in this function)\nhttp-push.c:1117: error: 's' undeclared (first use in this function)\nhttp-push.c: In function 'lock_remote':\nhttp-push.c:1187: error: 'XML_Parser' undeclared (first use in this function)\nhttp-push.c:1187: error: parse error before 'parser'\nhttp-push.c:1188: error: storage size of 'result' isn't known\nhttp-push.c:1276: warning: implicit declaration of function 'XML_SetUserData'\nhttp-push.c:1276: error: 'parser' undeclared (first use in this function)\nhttp-push.c:1277: warning: implicit declaration of function 'XML_SetElementHandler'\nhttp-push.c:1279: warning: implicit declaration of function 'XML_SetCharacterDataHandler'\nhttp-push.c:1280: warning: implicit declaration of function 'XML_Parse'\nhttp-push.c:1282: error: 'XML_STATUS_OK' undeclared (first use in this function)\nhttp-push.c:1283: warning: implicit declaration of function 'XML_ErrorString'\nhttp-push.c:1284: warning: implicit declaration of function 'XML_GetErrorCode'\nhttp-push.c:1284: warning: format '%s' expects type 'char *', but argument 3 has type 'int'\nhttp-push.c:1188: warning: unused variable 'result'\nhttp-push.c: In function 'check_locking':\nhttp-push.c:1353: error: 'XML_Parser' undeclared (first use in this function)\nhttp-push.c:1353: error: parse error before 'parser'\nhttp-push.c:1354: error: storage size of 'result' isn't known\nhttp-push.c:1392: error: 'parser' undeclared (first use in this function)\nhttp-push.c:1397: error: 'XML_STATUS_OK' undeclared (first use in this function)\nhttp-push.c:1399: warning: format '%s' expects type 'char *', but argument 2 has type 'int'\nhttp-push.c:1354: warning: unused variable 'result'\n\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n \nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\nSee PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!\n"},{"id":"11197","messageId":"87y8427zvn.fsf@briny.internal.ondioline.org","threadId":"2363","inReplyTo":"86acgiujuk.fsf@blue.stonehenge.com","subject":"Re: What's in git.git tonight","fromName":"Paul Collins","fromEmail":"paul@briny.ondioline.org","sentAt":"2005-11-06T11:57:16Z","receivedAt":"2005-11-06T11:57:16Z","isPatch":false,"sender":{"key":"paul@briny.ondioline.org","avatar":null},"body":"merlyn@stonehenge.com (Randal L. Schwartz) writes:\n\n> http-push.c no longer compiles on OSX:\n\nIt seems to require libexpat now. I got the same error here on Debian.\nWith libexpat-dev installed it builds.\n\n-- \nDag vijandelijk luchtschip de huismeester is dood\n"},{"id":"11198","messageId":"868xw2t1vg.fsf@blue.stonehenge.com","threadId":"2363","inReplyTo":"87y8427zvn.fsf@briny.internal.ondioline.org","subject":"Re: What's in git.git tonight","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2005-11-06T12:08:35Z","receivedAt":"2005-11-06T12:08:35Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":">>>>> \"Paul\" == Paul Collins writes:\n\nPaul> It seems to require libexpat now. I got the same error here on Debian.\nPaul> With libexpat-dev installed it builds.\n\nWell, there's no standard libexpat for OSX, so if you install it\nafter-market, it can end up in various directories.\n\nFor example, on my machine, I've installed it with fink, so I need\n\"-I/sw/include -L/sw/lib\" added to CFLAGS.\n\nIf you install it with darwinports, it will end up under\n\"/opt/local/{lib,include}\" instead.\n\nI suppose you could add those four things to CFLAGS for OSX and it\nwon't mess too many things up, but you'll also need to add a note that\nsays \"git requires expat, which can be obtained through fink or\ndarwinports. If you install expat manually, you may have to adjust\nCFLAGS in the Makefile\".\n\nAs a separate problem, why make git depend on expat if the only part\nof this is for DAV pushing? Can http-push simply refuse DAV URLs if\nbuilt without expat?\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n \nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\nSee PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!\n"},{"id":"11199","messageId":"20051106121149.GB30718@fiberbit.xs4all.nl","threadId":"2363","inReplyTo":"86acgiujuk.fsf@blue.stonehenge.com","subject":"Re: What's in git.git tonight","fromName":"Marco Roeland","fromEmail":"marco.roeland@xs4all.nl","sentAt":"2005-11-06T12:11:49Z","receivedAt":"2005-11-06T12:11:49Z","isPatch":false,"sender":{"key":"marco.roeland@xs4all.nl","avatar":null},"body":"On Sunday November 6th 2005 at 02:54 uur Randal L. Schwartz wrote:\n\n> \n> http-push.c no longer compiles on OSX:\n> \n> gcc -o http-push.o -c -g -O2 -Wall -DSHA1_HEADER='' http-push.c\n> http-push.c:10:19: error: expat.h: No such file or directory\n\nYou need to have the expat (XML parsing library) header files installed\nfrom something like the \"expat development kit\".\n\nIf you do already have 'expat.h' installed under say /usr/include does\nchanging \"#include \"expat.h\" to \"#include \" perhaps help?\nSearching for include files specified with #include \"...\" is somewhat\nplatform dependant.\n\nAlternatively, if you don't need 'git-http-push' you can define\n'NO_EXPAT' and the Makefile will take care that it doesn't get built.\n\nIncidentally 'git whatchanged -p http-push.c' shows that this dependency\non expat and its include header has been there since the first version\non November 2nd. So 'no longer compiles' seems a bit odd!\n-- \nMarco Roeland\n"},{"id":"11200","messageId":"861x1ut14a.fsf@blue.stonehenge.com","threadId":"2363","inReplyTo":"20051106121149.GB30718@fiberbit.xs4all.nl","subject":"Re: What's in git.git tonight","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2005-11-06T12:24:53Z","receivedAt":"2005-11-06T12:24:53Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":">>>>> \"Marco\" == Marco Roeland writes:\n\nMarco> Incidentally 'git whatchanged -p http-push.c' shows that this dependency\nMarco> on expat and its include header has been there since the first version\nMarco> on November 2nd. So 'no longer compiles' seems a bit odd!\n\nI haven't built since nov 2. Sorry, bit distracted with a conference. :)\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n \nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\nSee PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!\n"},{"id":"11201","messageId":"86u0eqrm64.fsf@blue.stonehenge.com","threadId":"2363","inReplyTo":"868xw2t1vg.fsf@blue.stonehenge.com","subject":"Re: What's in git.git tonight","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2005-11-06T12:33:07Z","receivedAt":"2005-11-06T12:33:07Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":">>>>> \"Randal\" == Randal L Schwartz writes:\n\nRandal> As a separate problem, why make git depend on expat if the only part\nRandal> of this is for DAV pushing? Can http-push simply refuse DAV URLs if\nRandal> built without expat?\n\nIgnore that. Yes, defining \"NO_EXPAT\" is enough. Didn't notice that there.\n\nAnd, I've confirmed that this patch does the trick, and will probably\ndefer any other issues with \"optional\" packages in the future:\n\ndiff --git a/Makefile b/Makefile\nindex 6f9b0d1..f89e0bd 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -185,6 +185,10 @@ uname_O := $(shell sh -c 'uname -o 2>/de\n ifeq ($(uname_S),Darwin)\n NEEDS_SSL_WITH_CRYPTO = YesPlease\n NEEDS_LIBICONV = YesPlease\n+ ## fink\n+ ALL_CFLAGS += -I/sw/include -L/sw/lib\n+ ## darwinports\n+ ALL_CFLAGS += -I/opt/local/include -L/opt/local/lib\n endif\n ifeq ($(uname_S),SunOS)\n NEEDS_SOCKET = YesPlease\n\nNote that whitespace may have been eaten... this was a cut-n-paste.\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n \nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\nSee PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!\n"},{"id":"11202","messageId":"Pine.LNX.4.63.0511061345460.2893@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2363","inReplyTo":"7v3bmayu2r.fsf@assigned-by-dhcp.cox.net","subject":"Re: What's in git.git tonight","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-06T12:46:11Z","receivedAt":"2005-11-06T12:46:11Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 6 Nov 2005, Junio C Hamano wrote:\n\n> - A 'git clone' change to fully populate remotes/origin; this\n> is more or less an RFC item; likes? dislikes?\n\nmelikes.\n"},{"id":"11212","messageId":"7vmzkhy5on.fsf@assigned-by-dhcp.cox.net","threadId":"2363","inReplyTo":"86u0eqrm64.fsf@blue.stonehenge.com","subject":"Re: What's in git.git tonight","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-06T18:47:20Z","receivedAt":"2005-11-06T18:47:20Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"merlyn@stonehenge.com (Randal L. Schwartz) writes:\n\n> And, I've confirmed that this patch does the trick, and will probably\n> defer any other issues with \"optional\" packages in the future:\n\nThanks. Next time around could you sign-off your patch?\n"},{"id":"11219","messageId":"87mzkh8oym.fsf@briny.internal.ondioline.org","threadId":"2363","inReplyTo":"7vmzkhy5on.fsf@assigned-by-dhcp.cox.net","subject":"Re: What's in git.git tonight","fromName":"Paul Collins","fromEmail":"paul@briny.ondioline.org","sentAt":"2005-11-06T21:07:45Z","receivedAt":"2005-11-06T21:07:45Z","isPatch":false,"sender":{"key":"paul@briny.ondioline.org","avatar":null},"body":"Junio C Hamano writes:\n\n> merlyn@stonehenge.com (Randal L. Schwartz) writes:\n>\n>> And, I've confirmed that this patch does the trick, and will probably\n>> defer any other issues with \"optional\" packages in the future:\n>\n> Thanks. Next time around could you sign-off your patch?\n\nA tiny nit:\n\n---\n\nConsistency is the hobgoblin of small minds, and mine is tiny indeed.\nDo not search the current directory when including expat.h, since it\nis not supplied by git.\n\nSigned-off-by: Paul Collins \n\ndiff --git a/http-push.c b/http-push.c\nindex c10067c..89fda42 100644\n--- a/http-push.c\n+++ b/http-push.c\n@@ -7,7 +7,7 @@\n \n #include \n #include \n-#include \"expat.h\"\n+#include \n \n static const char http_push_usage[] =\n \"git-http-push [--complete] [--force] [--verbose] [...]\\n\";\n\n\n-- \nDag vijandelijk luchtschip de huismeester is dood\n"}]}