{"thread":{"id":"3939","subject":"What's in git.git","startedAt":"2006-04-22T00:52:00Z","lastAt":"2006-04-22T11:25:53Z","messageCount":2,"participants":["Junio C Hamano","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"18983","messageId":"7vzmieo2j3.fsf@assigned-by-dhcp.cox.net","threadId":"3939","inReplyTo":null,"subject":"What's in git.git","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-04-22T00:52:00Z","receivedAt":"2006-04-22T00:52:00Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"* The 'maint' branch has these fixes since the last announcement.\n  They will be part of 1.3.1 early next week.\n\n  - Fix diff --stat filename output when binary files with long\n    names are involved (Jonas Fonseca)\n\n  - git-merge gives a bit more readable user guidance upon conflicts.\n\n  - The example pre-commit hook complains about conflict markers.\n\n  - Two fixes to git-commit --amend.\n\n  - Fix pack-objects.  This was discussed in this thread:\n\n    http://thread.gmane.org/gmane.comp.version-control.git/19021\n\n  - mailinfo: decode underscore used in \"Q\" encoding properly.\n\n    The versions before this fix broke some peoples names;\n    apologies to Santi and Lukas.\n\n  - Fix spawning of PAGER (Linus Torvalds).  This was discussed\n    in this thread:\n\n    http://thread.gmane.org/gmane.comp.version-control.git/18969\n\n  - Fix pack-object buffer size (Nicolas Pitre)\n\n  - Reintroduce svn pools to solve the memory leak (Santi Béjar)\n\n  - Document git-clone --reference (Shawn Pearce)\n\n\n* The 'master' branch has these since the last announcement.\n  All the 'maint' fixes are included.\n\n  - Big 'revision.c/log-tree.c' option parsing unification (Linus).\n  - Big log formatting unification (Linus).\n  - Built-in git-whatchanged.\n  - Do not fork PAGER=cat\n  - combine-diff --stat: show diffstat with the first parent.\n  - get_sha1() shorthands for blob/tree objects (Linus)\n  - Allow \"git repack\" users to specify repacking window/depth (Linus)\n  - Split up builtin commands into separate files from git.c (Linus)\n\n    Most of the above happened immediately after 1.3.0, and will\n    not be part of 1.3.X series, which is maintenance fixes only.\n\n    The general direction is that many commands we used to\n    implement as one liner pipe from git-rev-list to\n    git-diff-tree are converted into built-in C implementation.\n\n* The 'next' branch, in addition, has these.\n\n  - daemon::socksetup: don't return on set_reuse_addr() error (Serge E. Hallyn)\n\n    Comments?\n\n  - Tentative built-in format-patch\n\n    This is meant to be the next in the \"internalize rev-list\n    piped to diff-tree\" series.  Currently it does only --stdout\n    form and does not take any options.  It needs more work in\n    the core area to spit things out into separate files with\n    munged filenames.\n\n  - git-update-index --unresolve.  This was discussed in this\n    thread:\n\n    http://thread.gmane.org/gmane.comp.version-control.git/18936\n\n    This thread was fruitful; three patches came out of it.\n\n  - diff --stat: do not drop rename information.\n\n    I think this is ready to graduate to \"master\"; I just\n    haven't got around to it.\n\n    Johannes suggested \"file => /dev/null\" to show a deleted\n    file as if a rename was done.  While I think it makes some\n    sense, I am afraid it diverges too much from the traditional\n    diffstat output.  I am undecided, somewhat negative, about\n    the suggestion.\n\n* The 'pu' branch, in addition, has these.\n\n  - gitk: Fix geometry on rootless X (Johannes Schindelin)\n\n  - \"bind commit\" resurrected.\n\n    Somebody off-list volunteered to look into adding\n    subprojects support, so I merged the old codebase and placed\n    it here.  The merge conflict was not too bad, to my\n    surprise.  Subpro.txt file in the \"todo\" branch describes\n    one suggested plan, but who he codes gets to decide the\n    details of the implementation and semantics, so we will see\n    what emerges.  One big piece still missing from the core\n    side to implement Subpro.txt plan is an enhancement to the\n    index file format to do \"update-index --bind/--unbind\".  I\n    may have to fill that gap over the weekend, but no firm\n    promises.\n\n  - contrib/colordiff.\n\n    This is an external colorizer you can use by saying:\n    \n\tPAGER=\"colordiff | less -RS\" git log --cc\n\n  - colored diff with diff.usecolor configuration option.\n\n    I'll not be using colorization myself, so there is no strong\n    incentive on my part to carry this forward, but this is here\n    just in case if people are interested.  Currently it does\n    not do color for combined diffs.\n"},{"id":"19005","messageId":"Pine.LNX.4.63.0604221318500.30863@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"3939","inReplyTo":"7vzmieo2j3.fsf@assigned-by-dhcp.cox.net","subject":"Re: What's in git.git","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-04-22T11:25:53Z","receivedAt":"2006-04-22T11:25:53Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 21 Apr 2006, Junio C Hamano wrote:\n\n>   - diff --stat: do not drop rename information.\n> \n>     Johannes suggested \"file => /dev/null\" to show a deleted\n>     file as if a rename was done.  While I think it makes some\n>     sense, I am afraid it diverges too much from the traditional\n>     diffstat output.  I am undecided, somewhat negative, about\n>     the suggestion.\n\nIt was not so much a suggestion, but a misinterpretation of your patch. I \nam also undecided and slightly negative about it.\n\n> * The 'pu' branch, in addition, has these.\n> \n>   - gitk: Fix geometry on rootless X (Johannes Schindelin)\n\nI talked to Paul about this, and was not only slightly negative about it. \nThe suggestion was to either use native versions of Tk (which might or \nmight not fix it), or fix Tk.\n\nHaving spent already some time with this workaround, I am not willing to \ninvest more of it, though.\n\nSo, if people want to do something about this patch, go wild.\n\nCiao,\nDscho\n"}]}