{"thread":{"id":"14784","subject":"What's cooking in git.git (Jul 2008, #11; Thu, 31)","startedAt":"2008-08-01T01:03:02Z","lastAt":"2008-08-01T01:03:02Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"85848","messageId":"7vfxppv96h.fsf@gitster.siamese.dyndns.org","threadId":"14784","inReplyTo":null,"subject":"What's cooking in git.git (Jul 2008, #11; Thu, 31)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-08-01T01:03:02Z","receivedAt":"2008-08-01T01:03:02Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking.  Commits prefixed\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.\n\nThe topics list the commits in reverse chronological order.  The topics\nmeant to be merged to the maintenance series have \"maint-\" in their names.\n\nDue to increased activity level from people including GSoC students, I\nexpect 'next' to stay somewhat more active than previous rounds during the\n1.6.0-rc cycle.  The request for people who usually follow 'next' is the\nsame as usual, though.  After -rc1 is tagged, please run 'master' for your\ndaily git use instead, in order to make sure 'master' does what it claims\nto do without regression.\n\nTentative schedule, my wishful thinking:\n\n - 1.6.0-rc2 (Aug  3)\n - 1.6.0-rc3 (Aug 10)\n\n----------------------------------------------------------------\n[New Topics]\n\n* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit\n + archive: allow --exec and --remote without equal sign\n\nNone of the following is for 1.6.0.\n\n* mv/merge-custom (Thu Jul 31 00:38:07 2008 +0200) 5 commits\n + builtin-help: always load_command_list() in cmd_help()\n + Add a second testcase for handling invalid strategies in git-merge\n + Add a new test for using a custom merge strategy\n + builtin-merge: allow using a custom strategy\n + builtin-help: make some internal functions available to other\n   builtins\n\n* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits\n - git-merge-octopus: use (merge-base A (merge B C D E...)) for\n   stepwise merge\n + merge-base-many: add trivial tests based on the documentation\n + documentation: merge-base: explain \"git merge-base\" with more than\n   2 args\n + merge-base: teach \"git merge-base\" to drive underlying\n   merge_bases_many()\n\n* jc/simplify-merges (Thu Jul 31 01:17:41 2008 -0700) 1 commit\n . revision traversal: show full history with merge simplification\n\n\"log --full-history\" is with too much clutter, \"log\" itself is too cleverer\nthan some people, and here is the middle level of merge simplification.\n\n----------------------------------------------------------------\n[On Hold and/or Cooking]\n\nNone of the following is for 1.6.0.\n\n* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits\n + Documentation: Improve documentation for git-imap-send(1)\n + imap-send.c: more style fixes\n + imap-send.c: style fixes\n + git-imap-send: Support SSL\n + git-imap-send: Allow the program to be run from subdirectories of\n   a git tree\n\nSome people seem to prefer having this feature available also with gnutls.\nSuch an enhancement can be done in-tree on top of this series if they are\nso inclined.\n\n* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits\n - bisect: only check merge bases when needed\n - bisect: test merge base if good rev is not an ancestor of bad rev\n\n* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits\n + builtin-add.c: optimize -A option and \"git add .\"\n + builtin-add.c: restructure the code for maintainability\n\n* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits\n + spawn pager via run_command interface\n + run-command: add pre-exec callback\n\nThis changes the parent-child relationship between the pager and the git\nprocess.  We used to make pager the parent which meant that the exit\nstatus from git is lost from the caller.\n\n* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit\n + Enable threaded delta search on *BSD and Linux.\n\n* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit\n + merge: remove deprecated summary and diffstat options and config\n   variables\n\nThis was previously in \"will be in master soon\" category, but it turns out\nthat the synonyms to the ones this one deletes are fairly new invention\nthat happend in 1.5.6 timeframe, and we cannot do this just yet.  Perhaps\nin 1.7.0.\n\n* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits\n + Revert \"Make clients ask for \"git program\" over ssh and local\n   transport\"\n + Make clients ask for \"git program\" over ssh and local transport\n\nThis is the \"botched\" one.  Will be resurrected during 1.7.0 or 1.8.0\ntimeframe.\n\n* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit\n . diff: enable \"too large a rename\" warning when -M/-C is explicitly\n   asked for\n\nThis would be the right thing to do for command line use, but gitk will be\nhit due to tcl/tk's limitation, so I am holding this back for now.\n"}]}