{"thread":{"id":"20418","subject":"What's cooking in git.git (Aug 2009, #01; Wed, 05)","startedAt":"2009-08-05T22:04:46Z","lastAt":"2009-08-06T08:24:24Z","messageCount":2,"participants":["Junio C Hamano","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"119713","messageId":"7v8whxx6gx.fsf@alter.siamese.dyndns.org","threadId":"20418","inReplyTo":null,"subject":"What's cooking in git.git (Aug 2009, #01; Wed, 05)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-08-05T22:04:46Z","receivedAt":"2009-08-05T22:04: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\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.\n\n----------------------------------------------------------------\n[New Topics]\n\n* gb/apply-ignore-whitespace (Tue Aug 4 13:16:49 2009 +0200) 1 commit\n - git apply: option to ignore whitespace differences\n\n* db/vcs-helper (Wed Aug 5 01:02:25 2009 -0400) 13 commits\n - Changes for new vcs-helper series\n - Add simple test cases of git-vcs-cvs functionality\n - First draft of CVS importer using the foreign-scm machinery\n - Allow helpers to request marks for fast-import\n - Allow helpers to report in \"list\" command that the ref is\n   unchanged\n - Add support for \"import\" helper command\n - Add a config option for remotes to specify a foreign vcs\n - Allow programs to not depend on remotes having urls\n - Allow fetch to modify refs\n - Use a function to determine whether a remote is valid\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\nThis consolidates various previous rounds from Daniel and Johan.\n\n* je/send-email-no-subject (Wed Aug 5 18:49:54 2009 +0200) 1 commit\n - send-email: confirm on empty mail subjects\n\n* zf/maint-gitweb-acname (Sun Aug 2 09:42:24 2009 +0200) 1 commit\n - gitweb: parse_commit_text encoding fix\n\n* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit\n - clean: require double -f options to nuke nested git repository and\n   work tree\n\n* jc/shortstatus (Tue Aug 4 23:55:22 2009 -0700) 5 commits\n - shortstatus: a new command\n - status: show worktree status of conflicted paths separately\n - wt-status.c: rework the way changes to the index and work tree are\n   summarized\n - diff-index: keep the original index intact\n - diff-index: report unmerged new entries\n\n* bc/mailsplit-cr-at-eol (Tue Aug 4 22:31:59 2009 -0500) 4 commits\n - Allow mailsplit (and hence git-am) to handle mails with CRLF line-\n   endings\n - builtin-mailsplit.c: remove read_line_with_nul() since it is no\n   longer used\n - builtin-mailinfo,builtin-mailsplit: use strbufs\n - strbuf: add new function strbuf_getwholeline()\n\n* jc/maint-merge-recursive-fix (Thu Jul 30 17:38:15 2009 -0700) 1 commit\n - merge-recursive: don't segfault while handling rename clashes\n\n----------------------------------------------------------------\n[Graduated to \"master\"]\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* 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* 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\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.\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\n----------------------------------------------------------------\n[In 'next']\n\n* js/run-command-updates (Tue Aug 4 11:28:40 2009 +0200) 7 commits\n + run-command.c: squelch a \"use before assignment\" warning\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\nWill merge soon.\n\n* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit\n + grep: Add --max-depth option.\n\nWill merge soon.\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* jp/symlink-dirs (Wed Jul 29 20:22:25 2009 -0700) 3 commits\n + git-checkout: be careful about untracked symlinks\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, and a few fix-ups.\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\nWill merge soon.\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\n----------------------------------------------------------------\n[In 'pu']\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\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* 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* tr/reset-checkout-patch (Tue Jul 28 23:20:12 2009 +0200) 8 commits\n - DWIM 'git stash save -p' for 'git stash -p'\n - Merge branch 'js/stash-dwim' into tr/reset-checkout-patch\n - Make 'git stash -k' a short form for 'git stash save --keep-index'\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* js/stash-dwim (Mon Jul 27 20:37:10 2009 +0200) 1 commit\n - Make 'git stash -k' a short form for 'git stash save --keep-index'\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"},{"id":"119759","messageId":"m3vdl1pcyb.fsf@localhost.localdomain","threadId":"20418","inReplyTo":"7v8whxx6gx.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Aug 2009, #01; Wed, 05)","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2009-08-06T08:24:24Z","receivedAt":"2009-08-06T08:24:24Z","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\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> Will merge soon.\n\nActually I'd rather only the first part (the 'blame' view\nimprovements) were merged.  \n\nThe 'blame_incremental' part is still in flux; I'll send in a while\nnext iteration of it.  Currently most important part is that\n\"Incremental blame (proof of concept)\" turns off sending\napplication/xhtml+xml because my browser (Firefox up to 1.5) turned on\nstrict mode also for JavaScript, which means no innerHTML.  Also there\nare quite a few items on the TODO list...\n\nI'm sorry that I haven't made it clear.  I should have send those two\nparts as a separate series, in separate threads.\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"}]}