-Subject: What's cooking in git.git (Oct 2008, #05; Wed, 22)
-X-master-at: 759ad19e772a79a2a5ae6b7377d57eb21d29e6a0
-X-next-at: 6ea41095c3a924d4f7d4e9d3f61fb472507612c8
+Subject: What's cooking in git.git (Nov 2008, #01; Sun, 02)
+X-master-at: 6a509a6f7f38906996ac791449d5bcc2f32eef23
+X-next-at: d8fa4e31e3b8200edfff5aad88f249208cc0c5ae
+cc: "David M. Syzdek" <david.syzdek@acsalaska.net>, pasky@suse.cz
-What's cooking in git.git (Oct 2008, #05; Wed, 22)
+What's cooking in git.git (Nov 2008, #01; Sun, 02)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed
----------------------------------------------------------------
[New Topics]
+* mv/maint-branch-m-symref (Sat Nov 1 00:25:44 2008 +0100) 5 commits
+ + update-ref --no-deref -d: handle the case when the pointed ref is
+ packed
+ + git branch -m: forbid renaming of a symref
+ + Fix git update-ref --no-deref -d.
+ + rename_ref(): handle the case when the reflog of a ref does not
+ exist
+ + Fix git branch -m for symrefs.
+
+* rs/blame (Sat Oct 25 15:31:36 2008 +0200) 5 commits
+ - blame: use xdi_diff_hunks(), get rid of struct patch
+ - add xdi_diff_hunks() for callers that only need hunk lengths
+ - Allow alternate "low-level" emit function from xdl_diff
+ - Always initialize xpparam_t to 0
+ - blame: inline get_patch()
+
+* ds/uintmax-config (Sun Oct 26 03:52:47 2008 -0800) 2 commits
+ - Add Makefile check for FreeBSD 4.9-SECURITY
+ - Build: add NO_UINTMAX_T to support ancient systems
+
+I amended the topmost one to widen the applicability of this new feature
+to all FreeBSD 4.*, not limited to 4.9-SECURITY; testing before this hits
+'next' is appreciated.
+
+* ds/autoconf (Sun Nov 2 01:04:46 2008 -0700) 2 commits
+ - DONTMERGE: fixup with a convenience macro
+ - autoconf: Add link tests to each AC_CHECK_FUNC() test
+
+The topmost one is my attempt to simplify the new way of checking; the
+resulting configure.ac produces the identical configure script with or
+without it, so I think it is Ok, but testing before this hits 'next' is
+appreciated. If all goes well, I think the two should be squashed into
+one patch.
+
+* 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
+
+* ar/maint-mksnpath (Mon Oct 27 11:22:09 2008 +0100) 7 commits
+ + Use git_pathdup instead of xstrdup(git_path(...))
+ + git_pathdup: returns xstrdup-ed copy of the formatted path
+ + Fix potentially dangerous use of git_path in ref.c
+ + Add git_snpath: a .git path formatting routine with output buffer
+ + Fix potentially dangerous uses of mkpath and git_path
+ + Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
+ + Add mksnpath which allows you to specify the output buffer
+
+* ar/mksnpath (Thu Oct 30 18:08:58 2008 -0700) 10 commits
+ + Merge branch 'ar/maint-mksnpath' into ar/mksnpath
+ + Use git_pathdup instead of xstrdup(git_path(...))
+ + git_pathdup: returns xstrdup-ed copy of the formatted path
+ + Fix potentially dangerous use of git_path in ref.c
+ + Add git_snpath: a .git path formatting routine with output buffer
+ + Fix potentially dangerous uses of mkpath and git_path
+ + Merge branch 'ar/maint-mksnpath' into HEAD
+ + Fix potentially dangerous uses of mkpath and git_path
+ + Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c
+ + Add mksnpath which allows you to specify the output buffer
+
+----------------------------------------------------------------
+[Will be merged to 'master' soon]
+
* cj/maint-gitpm-fix-maybe-self (Sat Oct 18 20:25:12 2008 +0200) 1 commit
+ Git.pm: do not break inheritance
Looked Ok; will be in 'master' soon.
* gb/gitweb-pathinfo (Tue Oct 21 21:34:54 2008 +0200) 5 commits
- - gitweb: generate parent..current URLs
- - gitweb: parse parent..current syntax from PATH_INFO
- - gitweb: use_pathinfo filenames start with /
- - gitweb: generate project/action/hash URLs
- - gitweb: parse project/action/hash_base:filename PATH_INFO
+ + gitweb: generate parent..current URLs
+ + gitweb: parse parent..current syntax from PATH_INFO
+ + gitweb: use_pathinfo filenames start with /
+ + gitweb: generate project/action/hash URLs
+ + gitweb: parse project/action/hash_base:filename PATH_INFO
-Seventh iteration; hopefully the usual gitweb gangs will give quick
-comments and ack to push this out to 'next' soon.
+Seventh iteration.
* ag/blame-encoding (Wed Oct 22 00:55:57 2008 +0400) 1 commit
+ builtin-blame: Reencode commit messages according to git-log
Looked Ok; will be in 'master' soon.
-----------------------------------------------------------------
-[Graduated to "master"]
-
-* rs/alloc-ref (Sat Oct 18 10:44:18 2008 +0200) 3 commits
- + make alloc_ref_from_str() the new alloc_ref()
- + use alloc_ref_from_str() everywhere
- + add alloc_ref_with_prefix()
-
-* jc/maint-reset-remove-unmerged-new (Wed Oct 15 16:00:06 2008 -0700) 1 commit
- + reset --hard/read-tree --reset -u: remove unmerged new paths
-
-Teaches "reset --hard" to remove new paths in conflict.
-
-* jk/fix-ls-files-other (Fri Oct 17 13:03:52 2008 -0700) 2 commits
- + Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other
- + refactor handling of "other" files in ls-files and status
-
-* jc/maint-co-track (Fri Oct 17 15:44:39 2008 -0700) 4 commits
- + Fix checkout not to clobber the branch when using symlinked HEAD
- upon detaching
- + Enhance hold_lock_file_for_{update,append}() API
- + demonstrate breakage of detached checkout with symbolic link HEAD
- + Fix "checkout --track -b newbranch" on detached HEAD
-
-* jk/maint-ls-files-other (Thu Oct 16 11:07:26 2008 -0400) 1 commit
- + refactor handling of "other" files in ls-files and status
-
-* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits
- + tutorial: update output of git commit
- + reformat informational commit message
- + git commit: Reformat output somewhat
- + builtin-commit.c: show on which branch a commit was added
-
-* js/maint-fetch-update-head (Tue Oct 14 15:32:20 2008 -0700) 2 commits
- + pull: allow "git pull origin $something:$current_branch" into an
- unborn branch
- + Fix fetch/pull when run without --update-head-ok
-
-* ns/rebase-noverify (Tue Oct 14 08:17:16 2008 +0900) 2 commits
- + rebase: Document --no-verify option to bypass pre-rebase hook
- + rebase --no-verify
-
-This adds --no-verify to git rebase, to avoid the pre-rebase hook.
-
-* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit
- + builtin-commit: use reduce_heads() only when appropriate
-
-Fixes "git merge --no-ff --no-commit".
-
-* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit
- + rebase: Support preserving merges in non-interactive mode
-
-* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit
- + Do not rename read-only files during a push
-
-Fixes pack file renames on Windows.
-
-* sp/describe-lwtag (Mon Oct 13 07:39:46 2008 -0700) 1 commit
- + describe: Make --tags and --all match lightweight tags more often
-
-When the user gives --tags, the request is asking to treat lightweight and
-annotated tags at equal weight, and if lightweight ones are closer, they
-should be used.
-
-* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit
- + format-patch: autonumber by default
-
-* dp/checkattr (Wed Oct 15 09:11:52 2008 +0200) 3 commits
- + git-check-attr(1): use 'verse' for multi-line synopsis sections
- + check-attr: Add --stdin option
- + check-attr: add an internal check_attr() function
-
-Batch attr lookup via --stdin, for gitk and git-gui.
-
-* gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit
- + gitweb: refactor input parameters parse/validation
-
-A major cleanup on the way gitweb parses its input arguments.
-Future gitweb patches to add more arguments into the PATH_INFO
-depend upon this initial cleanup work.
-
-* ml/cygwin-filemode (Mon Oct 13 00:33:31 2008 -0400) 1 commit
- + compat/cygwin.c - Use cygwin's stat if core.filemode == true
-
-* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit
- + Implement git clone -v
-
-Does what it says it does. This may be ready for master soon,
-its a pretty trivial change.
-
-* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
- + Documentation: Refer to git-rebase(1) to warn against rewriting
- + Documentation: new upstream rebase recovery section in git-rebase
-
-Also the workflow document itself is now in 'master'.
+* sh/rebase-i-p (Wed Oct 22 11:59:30 2008 -0700) 9 commits
+ + git-rebase--interactive.sh: comparision with == is bashism
+ + rebase-i-p: minimum fix to obvious issues
+ + rebase-i-p: if todo was reordered use HEAD as the rewritten parent
+ + rebase-i-p: do not include non-first-parent commits touching
+ UPSTREAM
+ + rebase-i-p: only list commits that require rewriting in todo
+ + rebase-i-p: fix 'no squashing merges' tripping up non-merges
+ + rebase-i-p: delay saving current-commit to REWRITTEN if squashing
+ + rebase-i-p: use HEAD for updating the ref instead of mapping
+ OLDHEAD
+ + rebase-i-p: test to exclude commits from todo based on its parents
-* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit
- + rebase--interactive: fix parent rewriting for dropped commits
+Changes the `rebase -i -p` behavior to behave like git sequencer's
+rewrite of `rebase -i` would behave.
-* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits
- + diff: add filter for converting binary to text
- + diff: introduce diff.<driver>.binary
- + diff: unify external diff and funcname parsing code
- + t4012: use test_cmp instead of cmp
+* np/index-pack (Thu Oct 23 15:05:59 2008 -0400) 5 commits
+ + index-pack: don't leak leaf delta result
+ + improve index-pack tests
+ + fix multiple issues in index-pack
+ + index-pack: smarter memory usage during delta resolution
+ + index-pack: rationalize delta resolution code
-A general cleanup on how diff drivers are implemented. Its still
-missing documentation updates and tests but doesn't break anything
-current as far as I can tell.
+The buglets that caused people on 'next' some surprises are quickly
+killed. Thanks.
----------------------------------------------------------------
[Stalled]
+* 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
+
* 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.
Needs review.
-* 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.
-Waiting for a reroll.
-
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
- gitweb: Better processing format string in custom links in navbar
* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit
+ Fix reading of cloud tags
-Request-for-review-and-ack sent; waiting for response.
+Request-for-review-and-ack sent; still waiting for response.
----------------------------------------------------------------
-[Actively Cooking]
-
-* np/index-pack (Wed Oct 22 20:59:22 2008 -0400) 4 commits
- - improve index-pack tests
- + fix multiple issues in index-pack
- + index-pack: smarter memory usage during delta resolution
- + index-pack: rationalize delta resolution code
+[Dropped]
-The buglets that caused people on 'next' some surprises are quickly
-killed. Thanks.
-
-* sh/rebase-i-p (Wed Oct 22 11:59:30 2008 -0700) 9 commits
- + git-rebase--interactive.sh: comparision with == is bashism
- + rebase-i-p: minimum fix to obvious issues
- + rebase-i-p: if todo was reordered use HEAD as the rewritten parent
- + rebase-i-p: do not include non-first-parent commits touching
- UPSTREAM
- + rebase-i-p: only list commits that require rewriting in todo
- + rebase-i-p: fix 'no squashing merges' tripping up non-merges
- + rebase-i-p: delay saving current-commit to REWRITTEN if squashing
- + rebase-i-p: use HEAD for updating the ref instead of mapping
- OLDHEAD
- + rebase-i-p: test to exclude commits from todo based on its parents
+* 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
-Changes the `rebase -i -p` behavior to behave like git sequencer's
-rewrite of `rebase -i` would behave.
+Réne started code restructuring, which is queued to 'pu'; this series is
+dropped.
----------------------------------------------------------------
[On Hold]
-* 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.
-
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
- "git push": tellme-more protocol extension