What's in and What's cooking (Sep '08, #1)

new file mode 100644 index 0000000000..e398e38b2e --- /dev/null +++ b/whats/cooking/2008/09/01.txt @@ -0,0 +1,322 @@ +Subject: What's cooking in git.git (Sep 2008, #01; Sat, 06) +X-master-at: ec3a4ba519c0012d58584d23f407c302e7b80eb6 +X-next-at: d2470dbfc97c972e54913e3d3c622118526c9cc2 + +What's cooking in git.git (Sep 2008, #01; Sat, 06) +-------------------------------------------------- + +Here are the topics that have been cooking. Commits prefixed +with '-' are only in 'pu' while commits prefixed with '+' are +in 'next'. + +The topics list the commits in reverse chronological order. The topics +meant to be merged to the maintenance series have "maint-" in their names. + +---------------------------------------------------------------- +[New Topics] + +* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits + + t5300: improve SHA1 collision test + + pack-objects: don't include missing preferred base objects + + sha1write: don't copy full sized buffers + + Merge branch 'np/maint-safer-pack' into np/pack + +* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit + + diff --dirstat-by-file: count changed files, not lines + +* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit + - for-each-ref: `:short` format for `refname` + +* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit + + safe_create_leading_directories(): make it about "leading" + directories + +* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit + + daemon.c: avoid setlinebuf() + +* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits + + diff --quiet: make it synonym to --exit-code >/dev/null + + diff Porcelain: do not disable auto index refreshing on -C -C + +* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit + - git-apply:--include=pathspec + +* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits + + add '%d' pretty format specifier to show decoration + + move load_ref_decorations() to log-tree.c and export it + + log: add load_ref_decorations() + +* pb/commit-where (Fri Sep 5 19:13:05 2008 +0200) 1 commit + - Builtin-commit: show on which branch a commit was added + +---------------------------------------------------------------- +[Graduated to "master"] + +* np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits + + fixup_pack_header_footer(): use nicely aligned buffer sizes + + index-pack: use fixup_pack_header_footer()'s validation mode + + pack-objects: use fixup_pack_header_footer()'s validation mode + + improve reliability of fixup_pack_header_footer() + + pack-objects: improve returned information from write_one() + +* rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit + + builtin-help: fallback to GIT_MAN_VIEWER before man + +* ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits + + 'git foo' program identifies itself without dash in die() messages + + Start conforming code to "git subcmd" style + +* jc/author-nickname (Tue Aug 26 23:13:13 2008 -0700) 1 commit + + git commit --author=$name: look $name up in existing commits + +* dp/pid-uintmax (Sun Aug 31 14:09:39 2008 +0200) 1 commit + + cast pid_t's to uintmax_t to improve portability + +* nd/worktree (Sat Aug 30 16:15:32 2008 +0700) 5 commits + - setup_git_directory(): fix move to worktree toplevel directory + - update-index: fix worktree setup + + read-tree: setup worktree if merge is required + + grep: fix worktree setup + + diff*: fix worktree setup + +The last two fail test suite. + +* tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits + + Merge branch 'tr/rev-list-docs' into tr/filter-branch + + Merge branch 'jc/post-simplify' (early part) into tr/filter-branch + + revision --simplify-merges: make it a no-op without pathspec + + revision --simplify-merges: do not leave commits unprocessed + + revision --simplify-merges: use decoration instead of commit->util + field + + Documentation: rev-list-options: move --simplify-merges + documentation + + Merge branch 'jc/post-simplify' into tr/rev-list-docs + + filter-branch: use --simplify-merges + + Merge branch 'jc/post-simplify' into tr/filter-branch + + filter-branch: fix ref rewriting with --subdirectory-filter + + filter-branch: Extend test to show rewriting bug + + Topo-sort before --simplify-merges + + revision traversal: show full history with merge simplification + + revision.c: whitespace fix + +This now merges up all (and only) the necessary pieces from the +post-simplify topic and the documentation updates, ready to be merged to +"master". + +---------------------------------------------------------------- +[Stalled -- Needs Action to Proceed (or to be dropped)] + +* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits + - Use xdiff caching to improve git blame performance + - Allow xdiff machinery to cache hash results for a file + - Always initialize xpparam_t to 0 + - Bypass textual patch generation and parsing in git blame + - Allow alternate "low-level" emit function from xdl_diff + +Réne had good comments on how the callback should be structured. + +* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit + - git-am: Pass the --directory option through to git-apply + +---------------------------------------------------------------- +[Will be merged to "master" soon] + +* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit + + diff: Help "less" hide ^M from the output + +* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit + + checkout: do not check out unmerged higher stages randomly + +This is the same one as the bottom of "better conflict resolution" series; +it is a bugfix meant to be applied on 'maint'. + +* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits + + configure: auto detect dynamic library path switches + + Makefile: Allow CC_LD_DYNPATH to be overriden + +I decided to push this forward; it might break minority configurations, +but it appears nobody pays attention until it actually hurts, so let's see +what happens when this hits 'master'. + +* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits + + Add help.autocorrect to enable/disable autocorrecting + + git wrapper: DWIM mistyped commands + +---------------------------------------------------------------- +[Actively Cooking] + +* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits + + t6013: replace use of 'tac' with equivalent Perl + + rev-list: fix --reverse interaction with --parents + +* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 16 commits + + Fix AsciiDoc errors in merge documentation + + git-merge documentation: describe how conflict is presented + + checkout --conflict=<style>: recreate merge in a non-default style + + checkout -m: recreate merge when checking out of unmerged index + + Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict- + resolution' + + git-merge-recursive: learn to honor merge.conflictstyle + + merge.conflictstyle: choose between "merge" and "diff3 -m" styles + + rerere: understand "diff3 -m" style conflicts with the original + + rerere.c: use symbolic constants to keep track of parsing states + + xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or + less + + xmerge.c: minimum readability fixups + + xdiff-merge: optionally show conflicts in "diff3 -m" style + + xdl_fill_merge_buffer(): separate out a too deeply nested function + + checkout --ours/--theirs: allow checking out one side of a + conflicting merge + + checkout -f: allow ignoring unmerged paths when checking out of + the index + + checkout: do not check out unmerged higher stages randomly + +* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit + + date/time: do not get confused by fractional seconds + +* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit + + discard_cache: reset lazy name_hash bit + +I spotted this by accident while working on something unrelated. + +When a program calls discard_cache() to read the index again, we do not +properly re-initialize the name_hash structure that is used by the case +insensitivitly logic. This _might_ improve issues people may be having on +case insensitive filesystems. I dunno. + +* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit + + git-add --intent-to-add (-N) + +Teaches "git add" to record only the intent to add a path later. +I rerolled this without the fake empty blob object. + +* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits + + bisect: remove "checkout_done" variable used when checking merge + bases + + bisect: only check merge bases when needed + + bisect: test merge base if good rev is not an ancestor of bad rev + +* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits + + builtin-merge: release the lockfile in try_merge_strategy() + + merge-recursive: get rid of virtual_id + + merge-recursive: move current_{file,directory}_set to struct + merge_options + + merge-recursive: move the global obuf to struct merge_options + + merge-recursive: get rid of the index_only global variable + + merge-recursive: move call_depth to struct merge_options + + cherry-pick/revert: make direct internal call to merge_tree() + + builtin-merge: avoid run_command_v_opt() for recursive and subtree + + merge-recursive: introduce merge_options + + merge-recursive.c: Add more generic merge_recursive_generic() + + Split out merge_recursive() to merge-recursive.c + +* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit + + diff: vary default prefix depending on what are compared + +As some people may have noticed, I've been running with this one when +sending out "How about this" patches to the discussion threads. + +* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits + - revision --simplify-merges: incremental simplification + - revision --simplify-merges: prepare for incremental simplification + +I started making this incremental but the progress is not so great. + +---------------------------------------------------------------- +[On Hold] + +* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits + - Teach git.el to mark/unmark files by regexp + - git.el: Diff only file at point by default + +These are still queued but Alexandre had improvement requests so these +will likely be dropped. + +* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits + - git-am --forge: add Signed-off-by: line for the author + - git-am: clean-up Signed-off-by: lines + - stripspace: add --log-clean option to clean up signed-off-by: + lines + - stripspace: use parse_options() + - Add "git am -s" test + - git-am: refactor code to add signed-off-by line for the committer + +The one at second from the tip needs reworking. + +* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit + - "git push": tellme-more protocol extension + +* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit + - WIP: start teaching the --whitespace=fix to merge machinery + +* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits + - blame: show "previous" information in --porcelain/--incremental + format + - git-blame: refactor code to emit "porcelain format" output + +* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit + + merge: remove deprecated summary and diffstat options and config + variables + +This was previously in "will be in master soon" category, but it turns out +that the synonyms to the ones this one deletes are fairly new invention +that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps +in 1.7.0, but with the loud whining about moving git-foo out of $PATH we +have been hearing, it might not be a bad idea to drop this. + +* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit + - diff: enable "too large a rename" warning when -M/-C is explicitly + asked for + +This would be the right thing to do for command line use, but gitk will be +hit due to tcl/tk's limitation, so I am holding this back for now. + +---------------------------------------------------------------- +[Graduated to "master"] + +* np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits + + fixup_pack_header_footer(): use nicely aligned buffer sizes + + index-pack: use fixup_pack_header_footer()'s validation mode + + pack-objects: use fixup_pack_header_footer()'s validation mode + + improve reliability of fixup_pack_header_footer() + + pack-objects: improve returned information from write_one() + +* rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit + + builtin-help: fallback to GIT_MAN_VIEWER before man + +* ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits + + 'git foo' program identifies itself without dash in die() messages + + Start conforming code to "git subcmd" style + +* jc/author-nickname (Tue Aug 26 23:13:13 2008 -0700) 1 commit + + git commit --author=$name: look $name up in existing commits + +* dp/pid-uintmax (Sun Aug 31 14:09:39 2008 +0200) 1 commit + + cast pid_t's to uintmax_t to improve portability + +* nd/worktree (Sat Aug 30 16:15:32 2008 +0700) 5 commits + - setup_git_directory(): fix move to worktree toplevel directory + - update-index: fix worktree setup + + read-tree: setup worktree if merge is required + + grep: fix worktree setup + + diff*: fix worktree setup + +The last two fail test suite. + +* tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits + + Merge branch 'tr/rev-list-docs' into tr/filter-branch + + Merge branch 'jc/post-simplify' (early part) into tr/filter-branch + + revision --simplify-merges: make it a no-op without pathspec + + revision --simplify-merges: do not leave commits unprocessed + + revision --simplify-merges: use decoration instead of commit->util + field + + Documentation: rev-list-options: move --simplify-merges + documentation + + Merge branch 'jc/post-simplify' into tr/rev-list-docs + + filter-branch: use --simplify-merges + + Merge branch 'jc/post-simplify' into tr/filter-branch + + filter-branch: fix ref rewriting with --subdirectory-filter + + filter-branch: Extend test to show rewriting bug + + Topo-sort before --simplify-merges + + revision traversal: show full history with merge simplification + + revision.c: whitespace fix

new file mode 100644 index 0000000000..9f6a121565 --- /dev/null +++ b/whats/in/2008/09/01.txt @@ -0,0 +1,237 @@ +Subject: What's in git.git (Sep 2008, #01; Sat, 06) +X-maint-at: aaefbfa66c348a461b3081873ef42819c8b38dac +X-master-at: ec3a4ba519c0012d58584d23f407c302e7b80eb6 +X-maint-was: c67b1fa349cc7b4341b32b9ef1c58a3821ce0830 +X-master-was: a1184d85e8752658f02746982822f43f32316803 + +What's in git.git (Sep 2008, #01; Sat, 06) + + maint aaefbfa (Update draft release notes for 1.6.0.2) + master ec3a4ba (Update draft release notes for 1.6.1) +------------------------------------------------------------------------ + +Quite a many minor fixes appeared on 'maint'. 1.6.0.2 needs to happen +soon. Any favorite fixes (not feature enhancements) not on the list here? + +On the 'master' front, gitk, git-gui and git-svn subsystems had moderate +amount of updates. Among other things: + + - From gitk you can ask git-gui to show blame, and from git-gui's blame + you can ask gitk to show the commit and history; + + - "log --simplify-merges"; + + - "commit --author=$name" does not require "A U Thor <author@email.xz>" + in full; abbreviated request will look for a matching one in the + existing history; + + - "pack-objects" is safer against disc corruption; + + + +* The 'maint' branch has these fixes since the last announcement. + +Alex Riesen (1): + Fix use of hardlinks in "make install" + +Alexander Gavrilov (1): + git-gui: Fix string escaping in po2msg.sh + +Alexandre Bourget (2): + git-gui: Update french translation + git-gui: update all remaining translations to French. + +Andreas Färber (1): + Makefile: always provide a fallback when hardlinks fail + +Ask Bjørn Hansen (1): + Document sendemail.envelopesender configuration + +Björn Steinbrink (1): + for-each-ref: Allow a trailing slash in the patterns + +Clemens Buchacher (2): + git gui: show diffs with a minimum of 1 context line + clone: fix creation of explicitly named target directory + +Gustaf Hendeby (1): + Document clarification: gitmodules, gitattributes + +Heikki Orsila (2): + Start conforming code to "git subcmd" style + Improve documentation for --dirstat diff option + +Jeff King (2): + pretty=format: respect date format options + checkout: fix message when leaving detached HEAD + +Johan Herland (1): + Bring local clone's origin URL in line with that of a remote clone + +Jonas Fonseca (1): + Fix passwd(5) ref and reflect that commit doens't use commit-tree + +Junio C Hamano (11): + shell: do not play duplicated definition games to shrink the executable + Fix example in git-name-rev documentation + git-apply: Loosen "match_beginning" logic + gitattributes: -crlf is not binary + 'git foo' program identifies itself without dash in die() messages + Start 1.6.0.2 maintenance cycle + diff --cumulative is a sub-option of --dirstat + "blame -c" should be compatible with "annotate" + Mention the fact that 'git annotate' is only for backward compatibility. + stash: refresh the index before deciding if the work tree is dirty + Update draft release notes for 1.6.0.2 + +Linus Torvalds (1): + Fix '--dirstat' with cross-directory renaming + +Miklos Vajna (1): + Makefile: add merge_recursive.h to LIB_H + +Nanako Shiraishi (4): + tests: use "git xyzzy" form (t0000 - t3599) + tests: use "git xyzzy" form (t3600 - t6999) + tests: use "git xyzzy" form (t7000 - t7199) + tests: use "git xyzzy" form (t7200 - t9001) + +Nguyễn Thái Ngọc Duy (5): + diff*: fix worktree setup + grep: fix worktree setup + read-tree: setup worktree if merge is required + update-index: fix worktree setup + setup_git_directory(): fix move to worktree toplevel directory + +Nicolas Pitre (2): + discard revindex data when pack list changes + improve handling of sideband message display + +Paolo Bonzini (1): + make git-shell paranoid about closed stdin/stdout/stderr + +Paolo Ciarrocchi (1): + tutorial: gentler illustration of Alice/Bob workflow using gitk + +Petr Baudis (1): + bash completion: Hide more plumbing commands + +SZEDER Gábor (3): + Documentation: fix reference to a for-each-ref option + Documentation: fix disappeared lines in 'git stash' manpage + Documentation: minor cleanup in a use case in 'git stash' manual + +Shawn O. Pearce (2): + pack-objects: Allow missing base objects when creating thin packs + git-gui: Fix diff parsing for lines starting with "--" or "++" + +Teemu Likonen (1): + config.txt: Add missing colons after option name + +Yann Dirson (1): + Document gitk --argscmd flag. + + +* The 'master' branch has these since the last announcement + in addition to the above. + +Alex Riesen (5): + Remove calculation of the longest command name from where it is not used + Remove useless memset of static command name lists in builtin-merge.c + Make main_cmds and other_cmds local to builtin-help.c + Allow git help work without PATH set + list_commands: only call git_exec_path if it is needed + +Alexander Gavrilov (14): + git-gui: Support starting gitk from Gui Blame + git-gui: Support passing blame to a parent commit. + git-gui: Better positioning in Blame Parent Commit + git-gui: Allow specifying an initial line for git gui blame. + gitk: Add option to specify the default commit on command line + gitk: Add menu item for calling git gui blame + git-gui: Support resolving conflicts via the diff context menu. + git-gui: Support calling merge tools. + git-gui: Don't allow staging files with conflicts. + git-gui: Support more merge tools. + git-gui: Support conflict states _U & UT. + git-gui: Reimplement and enhance auto-selection of diffs. + git-gui: Make F5 reselect a diff, if an untracked file is selected. + git-gui: Show special diffs for complex conflict cases. + +Brandon Casey (1): + dir.c: Avoid c99 array initialization + +Christian Stimming (1): + git-gui: Mark forgotten strings for translation. + +David Soria Parra (1): + cast pid_t's to uintmax_t to improve portability + +Eric Wong (2): + git-svn: check error code of send_txstream + t9124: clean up chdir usage + +Florian Weimer (3): + git-svn: extract base blob in generate_diff + git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob + git-svn: Send deltas during commits + +Giuseppe Bilotta (1): + gitweb: ref markers link to named shortlogs + +Gustaf Hendeby (1): + git-gui: Teach git gui about file type changes + +Junio C Hamano (11): + revision.c: whitespace fix + revision traversal: show full history with merge simplification + Topo-sort before --simplify-merges + revision --simplify-merges: use decoration instead of commit->util field + revision --simplify-merges: do not leave commits unprocessed + revision --simplify-merges: make it a no-op without pathspec + daemon.c: minor style fixup + git commit --author=$name: look $name up in existing commits + Update draft release notes for 1.6.1 + log --author/--committer: really match only with name part + Update draft release notes for 1.6.1 + +Matthias Kestenholz (1): + bash-completion: Add all submodule subcommands to the completion list + +Nicolas Pitre (5): + pack-objects: improve returned information from write_one() + improve reliability of fixup_pack_header_footer() + pack-objects: use fixup_pack_header_footer()'s validation mode + index-pack: use fixup_pack_header_footer()'s validation mode + fixup_pack_header_footer(): use nicely aligned buffer sizes + +Paul Talacko (1): + git-svn: set auto_props when renaming files + +Romain Francoise (1): + builtin-help: fallback to GIT_MAN_VIEWER before man + +Stephen R. van den Berg (4): + git-daemon: call logerror() instead of error() + git-daemon: use LOG_PID, simplify logging code + git-daemon: Simplify dead-children reaping logic + git-daemon: rewrite kindergarden, new option --max-connections + +Thomas Rast (13): + filter-branch: Extend test to show rewriting bug + filter-branch: fix ref rewriting with --subdirectory-filter + filter-branch: use --simplify-merges + Documentation: rev-list-options: move --simplify-merges documentation + git svn: catch lack of upstream info for dcommit earlier + git svn info: tests: let 'init' test run with SVN 1.5 + git svn info: tests: do not use set -e + git svn info: tests: use test_cmp instead of git-diff + git svn info: tests: fix ptouch argument order in setup + git svn info: make info relative to the current directory + git svn info: always quote URLs in 'info' output + git-svn: match SVN 1.5 behaviour of info' on unknown item + git-svn: fix 'info' tests for unknown items + +Tor Arvid Lund (1): + git-p4: Fix checkout bug when using --import-local. +