From: Junio C Hamano Date: Thu, 13 Nov 2008 02:00:32 +0000 (-0800) Subject: What's in/cooking X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f43e271de64695391242f846700cfc32b32e357;p=thirdparty%2Fgit.git What's in/cooking --- diff --git a/whats/cooking/2008/11/04.txt b/whats/cooking/2008/11/04.txt new file mode 100644 index 0000000000..0b7ef10008 --- /dev/null +++ b/whats/cooking/2008/11/04.txt @@ -0,0 +1,197 @@ +Subject: What's cooking in git.git (Nov 2008, #04; Wed, 12) +X-master-at: 171d7661eda111d3e35f6e8097a1a3a07b30026c +X-next-at: c990ab59beabbf7e62799d0a0190cc0a5171aba2 + +What's cooking in git.git (Nov 2008, #04; Wed, 12) +-------------------------------------------------- + +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. + +I think we should declare -rc0 by the end of this week, with the goal of +including everything that are in 'next' as of tonight, plus the "narrow +checkout" and possibly Pierre's send-email that acts as format-patch +frontend, by the time we hit -rc1, perhaps soon after the end of month. + +---------------------------------------------------------------- +[New Topics] + +* mk/maint-cg-push (Mon Nov 10 22:47:11 2008 +0100) 1 commit + + git push: Interpret $GIT_DIR/branches in a Cogito compatible way + +* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 5 commits + + status: show "-v" diff even for initial commit + + Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip + + commit: Fix stripping of patch in verbose mode. + + wt-status: refactor initial commit printing + + define empty tree sha1 as a macro + +* jk/maint-commit-v-strip (Wed Nov 12 03:25:52 2008 -0500) 1 commit + + commit: Fix stripping of patch in verbose mode. + +* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits + - git send-email: ask less questions when --compose is used. + - git send-email: add --annotate option + - git send-email: interpret unknown files as revision lists + - git send-email: make the message file name more specific. + +* nd/rename-cache (Sat Nov 8 18:27:33 2008 +0700) 2 commits + - diffcore-rename: add config option to allow to cache renames + - diffcore-rename: support rename cache + +---------------------------------------------------------------- +[Will merge to "master" soon] + +* jk/deny-push-to-current (Sat Nov 8 20:49:27 2008 -0500) 2 commits + + receive-pack: detect push to current branch of non-bare repo + + t5516: refactor oddball tests + +* dl/xdiff (Fri Nov 7 21:24:33 2008 -0800) 1 commit + + xdiff: give up scanning similar lines early + +This performance fix may eventually need to be cherry-picked to 'maint'. + +* lt/decorate (Wed Nov 12 11:51:28 2008 +0100) 7 commits + + rev-list documentation: clarify the two parts of history + simplification + + Document "git log --simplify-by-decoration" + + Document "git log --source" + + revision traversal: '--simplify-by-decoration' + + Make '--decorate' set an explicit 'show_decorations' flag + + revision: make tree comparison functions take commits rather than + trees + + Add a 'source' decorator for commits + +* gb/gitweb-snapshot-pathinfo (Sun Nov 2 10:21:39 2008 +0100) 3 commits + + gitweb: embed snapshot format parameter in PATH_INFO + + gitweb: retrieve snapshot format from PATH_INFO + + gitweb: make the supported snapshot formats array global + +Got sick of waiting for re-Ack. + +* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit + + gitweb: Better processing format string in custom links in navbar + +Got sick of waiting for some sort of response from Pasky. + +* st/tag (Wed Nov 5 00:20:36 2008 +0100) 2 commits + + tag: Add more tests about mixing incompatible modes and options + + tag: Check that options are only allowed in the appropriate mode + +* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 5 commits + - autoconf: Enable threaded delta search when pthreads are supported + + Add autoconf tests for pthreads + + Make Pthread link flags configurable + + Add Makefile check for FreeBSD 4.9-SECURITY + + Build: add NO_UINTMAX_T to support ancient systems + +I split the part that unconditionally enable threaded delta search on any +platform on which Pthread library is detected to be available from the +topmost one. Will merge the rest to 'master' soon. + +* jk/diff-convfilter (Sun Oct 26 00:50:02 2008 -0400) 8 commits + + enable textconv for diff in verbose status/commit + + wt-status: load diff ui config + + only textconv regular files + + userdiff: require explicitly allowing textconv + + refactor userdiff textconv code + + add userdiff textconv tests + + document the diff driver textconv feature + + diff: add missing static declaration + +* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 4 commits + + Avoid using non-portable `echo -n` in tests. + + add userdiff textconv tests + + document the diff driver textconv feature + + diff: add missing static declaration + +An update to the one above. + +---------------------------------------------------------------- +[Actively Cooking] + +* bc/maint-keep-pack (Sun Nov 9 23:59:58 2008 -0600) 9 commits + + pack-objects: extend --local to mean ignore non-local loose + objects too + + sha1_file.c: split has_loose_object() into local and non-local + counterparts + + t7700: demonstrate mishandling of loose objects in an alternate + ODB + + builtin-gc.c: use new pack_keep bitfield to detect .keep file + existence + + repack: do not fall back to incremental repacking with [-a|-A] + + repack: don't repack local objects in packs with .keep file + + pack-objects: new option --honor-pack-keep + + packed_git: convert pack_local flag into a bitfield and add + pack_keep + + t7700: demonstrate mishandling of objects in packs with a .keep + file + +A few commits were rewound from 'next' and replaced with new ones. + +* np/pack-safer (Sun Nov 9 13:11:06 2008 -0800) 11 commits + + t5303: fix printf format string for portability + + t5303: work around printf breakage in dash + + pack-objects: don't leak pack window reference when splitting + packs + + extend test coverage for latest pack corruption resilience + improvements + + pack-objects: allow "fixing" a corrupted pack without a full + repack + + make find_pack_revindex() aware of the nasty world + + make check_object() resilient to pack corruptions + + make packed_object_info() resilient to pack corruptions + + make unpack_object_header() non fatal + + better validation on delta base object offsets + + close another possibility for propagating pack corruption + +* mv/remote-rename (Mon Nov 10 21:43:03 2008 +0100) 4 commits + + git-remote: document the migration feature of the rename + subcommand + + git-remote rename: migrate from remotes/ and branches/ + + remote: add a new 'origin' variable to the struct + + Implement git remote rename + +* 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 + +* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits + - grep: skip files outside sparse checkout area + - checkout_entry(): CE_NO_CHECKOUT on checked out entries. + - Prevent diff machinery from examining worktree outside sparse + checkout + - ls-files: Add tests for --sparse and friends + - update-index: add --checkout/--no-checkout to update + CE_NO_CHECKOUT bit + - update-index: refactor mark_valid() in preparation for new options + - ls-files: add options to support sparse checkout + - Introduce CE_NO_CHECKOUT bit + - Extend index to save more flags + +Early parts looked Ok; I am trying to find time to review the whole thing +but fixing bugs in topics from other people here and there took almost all +my time this weekend. Not good. + +---------------------------------------------------------------- +[On Hold] + +* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit + - "git push": tellme-more protocol extension + +This seems to have a deadlock during communication between the peers. +Someone needs to pick up this topic and resolve the deadlock before it can +continue. + +* 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. diff --git a/whats/in/2008/11/02.txt b/whats/in/2008/11/02.txt new file mode 100644 index 0000000000..74c4e558f2 --- /dev/null +++ b/whats/in/2008/11/02.txt @@ -0,0 +1,172 @@ +Subject: What's in git.git (Nov 2008, #02; Wed, 12) +X-maint-at: c14639f7b14d3d856c7c1f6c097dd1cb9615a5d0 +X-master-at: 171d7661eda111d3e35f6e8097a1a3a07b30026c +X-maint-was: 1a9016aae5aa8c468bb2d8d5dd16303d5c005869 +X-master-was: 6a509a6f7f38906996ac791449d5bcc2f32eef23 + +What's in git.git (Nov 2008, #02; Wed, 12) + + maint c14639f (Start 1.6.0.5 cycle) + master 171d766 (git.html: Update the links to stale versions) +------------------------------------------------------------------------ + +BLURB HERE + +* The 'maint' branch has these fixes since the last announcement. + +Alex Riesen (7): + Add mksnpath which allows you to specify the output buffer + Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c + Fix potentially dangerous uses of mkpath and git_path + Add git_snpath: a .git path formatting routine with output buffer + Fix potentially dangerous use of git_path in ref.c + git_pathdup: returns xstrdup-ed copy of the formatted path + Use git_pathdup instead of xstrdup(git_path(...)) + +Alexandre Julliard (2): + checkout: Don't crash when switching away from an invalid branch. + git-submodule: Avoid printing a spurious message. + +Christian Couder (2): + Documentation: rev-list: change a few instances of "git-cmd" to "git cmd" + Documentation: bisect: change a few instances of "git-cmd" to "git cmd" + +Christian Jaeger (1): + Git.pm: do not break inheritance + +Clemens Buchacher (2): + do not force write of packed refs + push: fix local refs update if already up-to-date + +Daniel Lowe (1): + Fix non-literal format in printf-style calls + +Jeff King (1): + refactor handling of "other" files in ls-files and status + +Johannes Schindelin (1): + Fix fetch/pull when run without --update-head-ok + +Junio C Hamano (11): + pull: allow "git pull origin $something:$current_branch" into an unborn + branch + Fix "checkout --track -b newbranch" on detached HEAD + reset --hard/read-tree --reset -u: remove unmerged new paths + demonstrate breakage of detached checkout with symbolic link HEAD + Enhance hold_lock_file_for_{update,append}() API + Update draft 1.6.0.4 release notes + format-patch documentation: mention the special case of showing a single + commit + GIT 1.6.0.4 + Makefile: help people who run 'make check' by mistake + checkout: Fix "initial checkout" detection + Start 1.6.0.5 cycle + +Matt Kraai (1): + Remove the period after the git-check-attr summary + +Mikael Magnusson (1): + Document that git-log takes --all-match. + +Miklos Vajna (5): + Fix git branch -m for symrefs. + rename_ref(): handle the case when the reflog of a ref does not exist + Fix git update-ref --no-deref -d. + git branch -m: forbid renaming of a symref + update-ref --no-deref -d: handle the case when the pointed ref is packed + +Nicolas Pitre (1): + Fix pack.packSizeLimit and --max-pack-size handling + +Quy Tonthat (1): + Update RPM spec for the new location of git-cvsserver. + +Stefan Naewe (1): + git ls-remote: make usage string match manpage + +Yann Dirson (1): + Add reference for status letters in documentation. + + +* The 'master' branch has these since the last announcement + in addition to the above. + +Alex Riesen (1): + Fix potentially dangerous uses of mkpath and git_path + +Alexander Gavrilov (5): + builtin-blame: Reencode commit messages according to git-log rules. + Windows: Make OpenSSH properly detect tty detachment. + gitweb: Use single implementation of export_ok check. + gitweb: Add a per-repository authorization hook. + gitweb: Fix mod_perl support. + +Brian Downing (2): + Always initialize xpparam_t to 0 + Allow alternate "low-level" emit function from xdl_diff + +Christian Couder (1): + bisect: fix missing "exit" + +Daniel Lowe (1): + Fix non-literal format in printf-style calls + +David M. Syzdek (1): + autoconf: Add link tests to each AC_CHECK_FUNC() test + +David Symonds (1): + git-diff: Add --staged as a synonym for --cached. + +Giuseppe Bilotta (5): + gitweb: parse project/action/hash_base:filename PATH_INFO + gitweb: generate project/action/hash URLs + gitweb: use_pathinfo filenames start with / + gitweb: parse parent..current syntax from PATH_INFO + gitweb: generate parent..current URLs + +Jeff King (1): + t5400: expect success for denying deletion + +John Chapman (2): + git-p4: Support purged files and optimize memory usage + git-p4: Cache git config for performance + +Junio C Hamano (6): + Fix reading of cloud tags + rebase-i-p: minimum fix to obvious issues + git-rebase--interactive.sh: comparision with == is bashism + Update draft release notes to 1.6.1 + Update draft release notes to 1.6.1 + git.html: Update the links to stale versions + +Markus Heidelberg (1): + Makefile: add install-man rules (quick and normal) + +Miklos Vajna (1): + parse-opt: migrate builtin-checkout-index. + +Nicolas Pitre (5): + index-pack: rationalize delta resolution code + index-pack: smarter memory usage during delta resolution + fix multiple issues in index-pack + improve index-pack tests + index-pack: don't leak leaf delta result + +Pete Harlan (2): + contrib/hooks/post-receive-email: Put rev display in separate function + contrib/hooks/post-receive-email: Make revision display configurable + +René Scharfe (3): + blame: inline get_patch() + add xdi_diff_hunks() for callers that only need hunk lengths + blame: use xdi_diff_hunks(), get rid of struct patch + +Stephen Haberman (7): + rebase-i-p: test to exclude commits from todo based on its parents + rebase-i-p: use HEAD for updating the ref instead of mapping OLDHEAD + rebase-i-p: delay saving current-commit to REWRITTEN if squashing + rebase-i-p: fix 'no squashing merges' tripping up non-merges + rebase-i-p: only list commits that require rewriting in todo + rebase-i-p: do not include non-first-parent commits touching UPSTREAM + rebase-i-p: if todo was reordered use HEAD as the rewritten parent +