{"thread":{"id":"20284","subject":"What's cooking in git.git (Jul 2009, #03; Wed, 29)","startedAt":"2009-07-29T21:19:46Z","lastAt":"2009-07-30T00:50:46Z","messageCount":3,"participants":["Junio C Hamano","Johannes Schindelin","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"119102","messageId":"7vzlanqj9p.fsf@alter.siamese.dyndns.org","threadId":"20284","inReplyTo":null,"subject":"What's cooking in git.git (Jul 2009, #03; Wed, 29)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-07-29T21:19:46Z","receivedAt":"2009-07-29T21:19:46Z","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 with '-' are\nonly in 'pu' while commits prefixed with '+' are in 'next'.  The ones\nmarked with '.' do not appear in any of the branches, but I am still\nholding onto them.\n\nIn preparation for rewinding 'next' after a major release, one topic was\nreverted and kicked back to 'pu' to give it a fresh start.\n\nAfter the 1.6.5 cycle, the next release will be 1.7.0, and we will push\nout the planned \"push safety\" change.  1.7.0 would be a good time to\nintroduce \"justifiable\" changes that are not strictly backward compatible.\n\nDuring 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.\nI've already merged the \"diff --exit-code --ignore-whitespace\" change and\n\"push safety\" change.\n\nI'll rewind 'next' sometime this weekend.\n\n----------------------------------------------------------------\n[In 'next']\n\n* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit\n + Shift object enumeration out of upload-pack\n\n* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 6 commits\n + receive-pack: remove unnecessary run_status report\n + run_command: report failure to execute the program, but optionally\n   don't\n + run_command: encode deadly signal number in the return value\n + run_command: report system call errors instead of returning error\n   codes\n + run_command: return exit code as positive value\n + MinGW: simplify waitpid() emulation macros\n\n* sb/maint-pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits\n + pull: support rebased upstream + fetch + pull --rebase\n + t5520-pull: Test for rebased upstream + fetch + pull --rebase\n\n* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits\n + diff: Rename QUIET internal option to QUICK\n + diff: change semantics of \"ignore whitespace\" options\n\nThis changes exit code from \"git diff --ignore-whitespace\" and friends\nwhen there is no actual output.  It is a backward incompatible change, but\nwe could argue that it is a bugfix.\n\n* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits\n + Refuse deleting the current branch via push\n + Refuse updating the current branch in a non-bare repository via\n   push\n\nThis is old 'jc/deny-delete-current-1.7.0' and 'jc/1.7.0-push-safety'\ntopics redone.\n\n* sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits\n + read-tree: migrate to parse-options\n + read-tree: convert unhelpful usage()'s to helpful die()'s\n\n* sb/parse-options (Tue Jul 7 22:15:41 2009 -0700) 4 commits\n + prune-packed: migrate to parse-options\n + verify-pack: migrate to parse-options\n + verify-tag: migrate to parse-options\n + write-tree: migrate to parse-options\n\nParse-options migration; should be in 'master' soonish.\n\n* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit\n + grep: Add --max-depth option.\n\n* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits\n + t6050: check pushing something based on a replaced commit\n + Documentation: add documentation for \"git replace\"\n + Add git-replace to .gitignore\n + builtin-replace: use \"usage_msg_opt\" to give better error messages\n + parse-options: add new function \"usage_msg_opt\"\n + builtin-replace: teach \"git replace\" to actually replace\n + Add new \"git replace\" command\n + environment: add global variable to disable replacement\n + mktag: call \"check_sha1_signature\" with the replacement sha1\n + replace_object: add a test case\n + object: call \"check_sha1_signature\" with the replacement sha1\n + sha1_file: add a \"read_sha1_file_repl\" function\n + replace_object: add mechanism to replace objects found in\n   \"refs/replace/\"\n + refs: add a \"for_each_replace_ref\" function\n\nDoes not seem to hurt normal operation without \"replace\".  The basic idea\nshould be easier and safer to use than the graft mechanism.  I haven't\ntried the replacement myself, though.\n\n* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit\n + git init: optionally allow a directory argument\n\nStraightforward usability change.  Should be in 'master' soonish.\n\n* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit\n + init-db: migrate to parse-options\n\n* jk/maint-show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits\n + show: add space between multiple items\n + show: suppress extra newline when showing annotated tag\n\n* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit\n + apply: notice creation/removal patches produced by GNU diff\n\nBetter acceptance of some \"GNU patch\" output to create or remove files.\n\n----------------------------------------------------------------\n[In 'pu']\n\n* jp/symlink-dirs (Sun Jun 14 15:08:28 2009 +0200) 2 commits\n - lstat_cache: guard against full match of length of 'name'\n   parameter\n - Demonstrate bugs when a directory is replaced with a symlink\n\nJames's test scripts to expose corner case bugs in the merge and branch\nswitching machinery.\n\n* jh/vcs-cvs (Mon Jul 27 03:04:17 2009 +0200) 15 commits\n - Introduce a 'marks <filename>' feature to the foreign transport\n   code\n - Teach foreign transport code to perform the \"capabilities\" command\n - Preliminary clarifications to git-vcs documentation\n - fast-import: Add support for importing commit notes\n - Add a transport implementation using git-vcs-* helpers\n - Allow programs to not depend on remotes having urls\n - Use a function to determine whether a remote is valid\n - Add specification of git-vcs-* helper programs\n - Merge branch 'db/transport-shim' into jh/vcs-cvs\n - git-http-fetch: not a builtin\n - Use an external program to implement fetching with curl\n - Add support for external programs for handling native fetches\n - Add option for using a foreign VCS\n - Document details of transport function APIs\n - Allow late reporting of fetched hashes\n\nWith its 6th patch replaced to keep the pathname syntax of the fast-import\nlanguage, but without the commits near the tip of the old series.\n\n* db/transport-shim (Tue Jul 28 02:08:53 2009 -0400) 3 commits\n - git-http-fetch: not a builtin\n - Use an external program to implement fetching with curl\n - Add support for external programs for handling native fetches\n\n* jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits\n - t3302-notes-index-expensive: Speed up create_repo()\n - fast-import: Add support for importing commit notes\n - First draft of notes tree parser with support for fanout subtrees\n - Teach \"-m <msg>\" and \"-F <file>\" to \"git notes edit\"\n - Add an expensive test for git-notes\n - Speed up git notes lookup\n - Add a script to edit/inspect notes\n - Introduce commit notes\n\njh/vcs-cvs topic needs to be rebuilt, merging this instead of having its\nown copy of \"fast-import: Add support for importing commit notes\".\n\n* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits\n - Add option for using a foreign VCS\n - Document details of transport function APIs\n - Allow late reporting of fetched hashes\n\n* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits\n - rebase -i: use \"git sequencer--helper --make-patch\"\n - sequencer: free memory used in \"make_patch\" function\n - sequencer: add \"make_patch\" function to save a patch\n - sequencer: add \"builtin-sequencer--helper.c\"\n\nI do not know how this will interact with what Dscho has been doing.\n\n* jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit\n - mailinfo: -b option keeps [bracketed] strings that is not a\n   [PATCH] marker\n\n* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits\n - gitweb: Create links leading to 'blame_incremental' using\n   JavaScript\n - gitweb: Incremental blame (proof of concept)\n - gitweb: Add optional \"time to generate page\" info in footer\n - gitweb: Add -partial_query option to href() subroutine\n - gitweb: Use light/dark for class names also in 'blame' view\n - gitweb: Add author initials in 'blame' view, a la \"git gui blame\"\n - gitweb: Mark commits with no \"previous\" in 'blame' view\n - gitweb: Use \"previous\" header of git-blame -p in 'blame' view\n - gitweb: Mark boundary commits in 'blame' view\n - gitweb: Make .error style generic\n\nThere may have been updates during 1.6.4-rc period that I missed.\n\n* tr/reset-checkout-patch (Tue Jul 28 23:20:11 2009 +0200) 5 commits\n - Implement 'git stash save --patch'\n - Implement 'git checkout --patch'\n - Implement 'git reset --patch'\n - builtin-add: refactor the meat of interactive_add()\n - git-apply--interactive: Refactor patch mode code\n\n* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit\n - Allow --date=local --date=other-format to work as expected\n\n* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits\n - branch.c: if remote is not config'd for branch, don't try delete\n   push config\n - branch, checkout: introduce autosetuppush\n - move deletion of merge configuration to branch.c\n - remote: add per-remote autosetupmerge and autosetuprebase\n   configuration\n - introduce a struct tracking_config\n - branch: install_branch_config and struct tracking refactoring\n - config: allow false and true values for branch.autosetuprebase\n\nThis has been reverted from 'next' for now to give it a fresh start.\n\n----------------------------------------------------------------\n[Dropped]\n\n* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits\n . Fix for a merge where a branch has an F->D transition\n . Add a reminder test case for a merge with F/D transition\n\nThe fix the author hinted iffy is dropped for now, but the test case is\nalready in 'master' to remind us.\n"},{"id":"119112","messageId":"alpine.DEB.1.00.0907300043420.8306@pacific.mpi-cbg.de","threadId":"20284","inReplyTo":"7vzlanqj9p.fsf@alter.siamese.dyndns.org","subject":"cc/sequencer-rebase-i, was Re: What's cooking in git.git (Jul 2009, #03; Wed, 29)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-07-29T22:46:24Z","receivedAt":"2009-07-29T22:46:24Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 29 Jul 2009, Junio C Hamano wrote:\n\n> * cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits\n>  - rebase -i: use \"git sequencer--helper --make-patch\"\n>  - sequencer: free memory used in \"make_patch\" function\n>  - sequencer: add \"make_patch\" function to save a patch\n>  - sequencer: add \"builtin-sequencer--helper.c\"\n> \n> I do not know how this will interact with what Dscho has been doing.\n\nThere was no interaction at all; no change I have been doing in my \nrebase-i-p branch was regarded in the sequencer-rebase-i branch.\n\nI know I should work on this again (especially since I use it quite \nsuccessfully myself to rebase interactively, preserving merges), but the \nGod of time is not my friend.\n\nCiao,\nDscho\n"},{"id":"119137","messageId":"m3vdlb0zb6.fsf@localhost.localdomain","threadId":"20284","inReplyTo":"7vzlanqj9p.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Jul 2009, #03; Wed, 29)","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2009-07-30T00:50:46Z","receivedAt":"2009-07-30T00:50:46Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> * jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits\n>  - gitweb: Create links leading to 'blame_incremental' using\n>    JavaScript\n>  - gitweb: Incremental blame (proof of concept)\n>  - gitweb: Add optional \"time to generate page\" info in footer\n>  - gitweb: Add -partial_query option to href() subroutine\n>  - gitweb: Use light/dark for class names also in 'blame' view\n>  - gitweb: Add author initials in 'blame' view, a la \"git gui blame\"\n>  - gitweb: Mark commits with no \"previous\" in 'blame' view\n>  - gitweb: Use \"previous\" header of git-blame -p in 'blame' view\n>  - gitweb: Mark boundary commits in 'blame' view\n>  - gitweb: Make .error style generic\n> \n> There may have been updates during 1.6.4-rc period that I missed.\n\nThere weren't any updates.  I plan on replacing the 4 top patches soon\n(without '-partial_query' one, as it would not be needed), less proof\nof concept, but still RFC.\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"}]}