{"thread":{"id":"4736","subject":"What's in git.git","startedAt":"2006-07-02T07:45:56Z","lastAt":"2006-07-02T18:36:07Z","messageCount":4,"participants":["Junio C Hamano","Johannes Schindelin","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"23024","messageId":"7vr7145u17.fsf@assigned-by-dhcp.cox.net","threadId":"4736","inReplyTo":null,"subject":"What's in git.git","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-07-02T07:45:56Z","receivedAt":"2006-07-02T07:45:56Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The 'master' branch has been pushed out as GIT 1.4.1 tonight to\ncelebrate the birthday of lady gitster.\n\nIn \"next\", there are the following series:\n\n - rationalize diff output options by Timo Hirvonen.\n\n This makes \"diff --patch --stat\" operate sensibly. I have\n added about 100 tests to make sure that this does not regress\n diff/log commands, and made small fixups to Timo's version\n here and there.\n\n There are still slight differences in output between the\n current \"master\" version and Timo's version, but I believe\n they are all improvements. Curious people may want to take a\n look at the following two commits that updates the tests to\n match Timo's output:\n\n\tcommit 026625e78eaf8ea2ae960525c367b5e8f1629fd4\n\tcommit 9e76bab14e50c46c624ae35f13c527a7a1b1185d\n\n I think this is ready to be merged into \"master\", but further\n testing is appreciated.\n\n - A few Makefile clean-ups by Jakub Narebski.\n\n This is part of Jakub's \"optionally manage config.mk with\n autoconf generated configure script\" series. I have not been\n queueing the rest of the series but judging from the list\n traffic and the size and quality of the later pieces, the\n patch series might have stabilized enough to be resubmitted\n for consideration. Honestly, I am still somewhat reluctant,\n but my impression was it was still strictly \"opt-in\" so it\n might be OK.\n\n - git_merge_bases() by Johannes.\n\n Calling commit ancestry walkers more than once correctly is\n hard, and that is why I have accepted the libifying part with\n the change to use the lib by one caller that calls the\n function only once, without merging anything that calls the\n function more than once.\n\n I think this library part, with the clean-up by Rene Scharfe\n in \"pu\", is in good shape to be tested further. The '...'\n operator work would be a good demonstration to prove the\n libification is sound, before proceeding to bigger and more\n interesting users, like merge-recursive in C by Alex Riesen.\n\n Alex/Johannes team's effort seems to be progressing nicely\n and I am looking forward to seeing a version that is stable\n enough for testing.\n\n - gitweb updates by Dennis Stosberg and Luben Tuikov.\n\n I am personally running this on my private machine to see the\n progress made by Jakub so far with these updates, and am\n generally happy. I'd like to see the code further refactored\n before picking up any more new features, though. I see Jakub\n is talking with xmms2 team and am hoping to see we can see\n more cleanups they made in our tree soon (thanks Jakub).\n\n - instaweb by Eric Wong.\n\n I made a mismerge when accepting this series and \"next\" ended\n up with two copies of three \"gitweb\" related patches. Sorry\n for cluttering the history.\n\n - \"A better scheduled PPC SHA-1 implementation\" by linux@horizon.com\n\n - git-merge-tree WIP by Linus.\n\n I should take a look at this and follow it through but\n haven't spent as much time as I should have nor I would have\n liked yet.\n\n\nIn \"pu\", there are more interesting pieces:\n\n - updates to git-merge-bases with '...' operator by Rene Scharfe.\n\n This should come in \"next\" but I think Johannes has a point\n that library interface should be the easier-to-use version.\n\n Maybe we should have get_merge_bases_unclean() as an oddball\n function that does not clean up for performance, and make\n git-merge-base call that, and keep the name of the function\n for generic callers that does clean up short and sweet\n get_merge_bases().\n\n - updates to diff options rationalization by Timo Hirvonen.\n\n This makes --name-only, --name-status, --check and -s\n mutually exclusive, and makes 'git diff-files -s' behave like\n other diff commands (i.e. -s means \"silent\" -- so no output\n is seen). These are both optional.\n\n - \"Perly Git\" series by Pasky and Pavel Roskin.\n\n I've heard success stories from some but negatives from\n others. Feedback from people other than who are on Linux\n i386/x86-64 with Perl 5.8 are appreciated.\n\n In order to get a bit wider exposure without disrupting\n people, we might want to revert the fmt-merge-msg conversion\n with a workaround option in Makefile to allow skipping the\n build of perl/ subdirectory, and merge the result to \"next\".\n\n - GIT_TRACE by Matthias Lederhofer.\n - \"git grep boolean expression\" by me.\n\n I am not personally interested in these two very much, but I\n do not think they break anything. I may push them to \"next\"\n or keep them lingering on in \"pu\". I do not care too much\n either way myself -- people who are interested need to push\n my back.\n"},{"id":"23026","messageId":"Pine.LNX.4.63.0607021109540.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"4736","inReplyTo":"7vr7145u17.fsf@assigned-by-dhcp.cox.net","subject":"[PATCH] Makefile: replace ugly and unportable sed invocation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-07-02T09:31:30Z","receivedAt":"2006-07-02T09:31:30Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSigned-off-by: Johannes Schindelin \n---\n\tRe: What's in git.git\n\n\tOn Sun, 2 Jul 2006, Junio C Hamano wrote:\n\n\t> - instaweb by Eric Wong.\n\n\tThis breaks make on _all_ platforms I have.\n\n\tFirst of all, it is _ugly_ (three invocations of sed, where one \n\treally is sufficient). Then, it uses the non-portable ';' \n\toperator, and then, the non-at-all-portable 'T'.\n\n\tAnd worst: it is unnecessary.\n\n Makefile | 10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 7481ad9..90ad991 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -562,11 +562,11 @@ git-instaweb: git-instaweb.sh gitweb/git\n \t -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \\\n \t -e 's/@@NO_CURL@@/$(NO_CURL)/g' \\\n \t -e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \\\n-\t $@.sh | sed \\\n-\t -e 's|@@GITWEB_CGI@@|#!$(PERL_PATH_SQ)|; T; r gitweb/gitweb.cgi' \\\n-\t | sed \\\n-\t -e 's|@@GITWEB_CSS@@||; T; r gitweb/gitweb.css' \\\n-\t > $@+\n+\t -e '/@@GITWEB_CGI@@/rgitweb/gitweb.cgi' \\\n+\t -e '/@@GITWEB_CGI@@/d' \\\n+\t -e '/@@GITWEB_CSS@@/rgitweb/gitweb.css' \\\n+\t -e '/@@GITWEB_CSS@@/d' \\\n+\t $@.sh > $@+\n \tchmod +x $@+\n \tmv $@+ $@\n \n-- \n1.4.1.g1089\n"},{"id":"23033","messageId":"20060702115616.GA28291@soma","threadId":"4736","inReplyTo":"Pine.LNX.4.63.0607021109540.29667@wbgn013.biozentrum.uni-wuerzburg.de","subject":"[PATCH] instaweb: fix unportable ';' usage in sed","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-07-02T11:56:16Z","receivedAt":"2006-07-02T11:56:16Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Hint taken from Johannes. I've tested this with sed --posix on\nmy system with GNU sed and it works fine with and also without\nit. Further portability testing/review would be good.\n\nSigned-off-by: Eric Wong \n---\n\n Johannes Schindelin wrote:\n > \n > Signed-off-by: Johannes Schindelin \n > ---\n > \tRe: What's in git.git\n > \n > \tOn Sun, 2 Jul 2006, Junio C Hamano wrote:\n > \n > \t> - instaweb by Eric Wong.\n > \n > \tThis breaks make on _all_ platforms I have.\n > \n > \tFirst of all, it is _ugly_ (three invocations of sed, where one \n > \treally is sufficient). Then, it uses the non-portable ';' \n > \toperator, and then, the non-at-all-portable 'T'.\n > \n > \tAnd worst: it is unnecessary.\n\n *Blushes* Sorry about that, I've been meaning to brush up on my\n sed skills (coming from a Perl-heavy environment).\n\n git-instaweb.sh | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-instaweb.sh b/git-instaweb.sh\nindex 51067d9..69aef3c 100755\n--- a/git-instaweb.sh\n+++ b/git-instaweb.sh\n@@ -194,9 +194,9 @@ EOF\n }\n \n script='\n-s#^\\(my\\|our\\) $projectroot =.*#\\1 $projectroot = \"'`dirname $fqgitdir`'\";#;\n-s#\\(my\\|our\\) $gitbin =.*#\\1 $gitbin = \"'$GIT_EXEC_PATH'\";#;\n-s#\\(my\\|our\\) $projects_list =.*#\\1 $projects_list = $projectroot;#;\n+s#^\\(my\\|our\\) $projectroot =.*#\\1 $projectroot = \"'`dirname $fqgitdir`'\";#\n+s#\\(my\\|our\\) $gitbin =.*#\\1 $gitbin = \"'$GIT_EXEC_PATH'\";#\n+s#\\(my\\|our\\) $projects_list =.*#\\1 $projects_list = $projectroot;#\n s#\\(my\\|our\\) $git_temp =.*#\\1 $git_temp = \"'$fqgitdir/gitweb/tmp'\";#'\n \n gitweb_cgi () {\n-- \n1.4.1.rc2.gbc4f\n"},{"id":"23041","messageId":"7virmf4zxk.fsf@assigned-by-dhcp.cox.net","threadId":"4736","inReplyTo":"Pine.LNX.4.63.0607021109540.29667@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] Makefile: replace ugly and unportable sed invocation","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-07-02T18:36:07Z","receivedAt":"2006-07-02T18:36:07Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> \tFirst of all, it is _ugly_ (three invocations of sed, where one \n> \treally is sufficient). Then, it uses the non-portable ';' \n> \toperator, and then, the non-at-all-portable 'T'.\n>\n> \tAnd worst: it is unnecessary.\n\nThanks -- I was not paying enough attention.\n"}]}