@ -1,9 +1,9 @@
@@ -1,9 +1,9 @@
To: git@vger.kernel.org
Subject: What's cooking in git.git (Jan 2009, #02; Sun, 11)
X-master-at: 7eb5bbdb645e04d746bc0edea102744f50a5e529
X-next-at: 1b01dafc9b8818adbe83018ebe1c21daf7fbed87
Subject: What's cooking in git.git (Jan 2009, #03; Wed, 14)
X-master-at: 3cf3b838c7b379824c68ee87799aaaa9028b36cd
X-next-at: 5b4a894b226c0bf6c51c888eeb06524eeb201ab9
What's cooking in git.git (Jan 2009, #02; Sun, 11)
What's cooking in git.git (Jan 2009, #03; Wed, 14)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed
@ -14,69 +14,75 @@ but I am still holding onto them.
@@ -14,69 +14,75 @@ but I am still holding onto them.
The topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
Sorry to have been lagging a bit. There are a few patches I am interested
in but haven't studied yet nor mentioned here. I've been swamped outside
git lately for the past few days, but hopefully I can get to them shortly.
----------------------------------------------------------------
[New Topics]
* rs/fgrep (Sat Jan 10 00:18:34 2009 +0100) 2 commits
+ grep: don't call regexec() for fixed strings
+ grep -w: forward to next possible position after rejected match
* kb/am-directory (Sun Jan 11 22:21:48 2009 -0800) 1 commit
+ git-am: add --directory=<dir> option
* lt/zlib-wrap-xprm (Wed Jan 7 19:54:47 2009 -0800) 1 commit
- Wrap inflateInit to retry allocation after releasing pack memory
This is "third-time-lucky, perhaps?" resurrection. I do not think I'd be
using this very often, but it originated from a real user request.
Need to clean up the log message, perhaps rebase it to maint-1.6.0 and
start cooking in 'next'.
* jk/signal-cleanup (Sun Jan 11 06:36:49 2009 -0500) 3 commits
- pager: do wait_for_pager on signal death
- refactor signal handling for cleanup functions
- chain kill signals for cleanup functions
* jc/maint-format-patch (Sat Jan 10 12:41:33 2009 -0800) 1 commit
+ format-patch: show patch text for the root commit
* kb/lstat-cache (Tue Jan 13 13:29:08 2009 +0100) 5 commits
- lstat_cache(): introduce clear_lstat_cache() function
- lstat_cache(): introduce invalidate_lstat_cache() function
- lstat_cache(): introduce has_dirs_only_path() function
- lstat_cache(): introduce has_symlink_or_noent_leading_path()
function
- lstat_cache(): more cache effective symlink/directory detection
* tr/maint-no-index-fixes (Wed Jan 7 12:15:30 2009 +0100) 3 commits
+ diff --no-index -q: fix endless loop
+ diff --no-index: test for pager after option parsing
+ diff: accept -- when using --no-index
This is the seventh round; although the author asked me not to bother, I
couldn't resist. I renamed one helper function while reading the patches
and made minor adjustments on styles, but it looked reasonable.
* gb/gitweb-opml (Fri Jan 2 13:49:30 2009 +0100) 2 commits
- gitweb: suggest name for OPML view
- gitweb: don't use pathinfo for global actions
* lh/submodule-tree-traversal (Mon Jan 12 00:45:55 2009 +0100) 3 commits
- builtin-ls-tree: enable traversal of submodules
- archive.c: enable traversal of submodules
- tree.c: add support for traversal of submodules
* mh/maint-commit-color-status (Thu Jan 8 19:53:05 2009 +0100) 2 commits
- git-status -v: color diff output when color.ui is set
- git-commit: color status output when color.ui is set
* jc/maint-format-patch-o-relative (Mon Jan 12 15:18:02 2009 -0800) 1 commit
- Teach format-patch to handle output directory relative to cwd
* ks/maint-mailinfo-folded (Thu Jan 8 01:43:42 2009 +0300) 1 commit
- mailinfo: correctly handle multiline 'Subject:' header
This was my lunchtime "this may fix it" response to a breakage report. I
haven't really thought things through but my gut feeling is this might
break things for minorities who are accustomed to the existing behaviour,
especially wrt the filenames reported on the standard output.
* js/patience-diff (Thu Jan 1 17:39:37 2009 +0100) 3 commits
- bash completions: Add the --patience option
- Introduce the diff option '--patience'
- Implement the patience diff algorithm
* lt/maint-wrap-zlib (Wed Jan 7 19:54:47 2009 -0800) 1 commit
+ Wrap inflate and other zlib routines for better error reporting
All of the above 'pu' topics are ready for 'next'.
Needs the "free our memory upon seeing Z_MEM_ERROR and try again" bits
extracted from Shawn's patch on top of this one.
* ap/clone-into-empty (Fri Jan 9 02:24:23 2009 +0300) 2 commits
- Use is_pseudo_dir_name everywhere
- Allow cloning to an existing empty directory
* js/diff-color-words (Sun Jan 11 21:00:58 2009 +0100) 4 commits
- color-words: take an optional regular expression describing words
- color-words: refactor to allow for 0-character word boundaries
- color-words: refactor word splitting and use ALLOC_GROW()
- Add color_fwrite(), a function coloring each line individually
There is an updated patch that only refactors the repeated code to check
if a dirent is dot or dot-dot posted, which I should have picked up to
replace these but I haven't yet (the "clone into empty" can and should
build on top of it).
Dscho's series that was done in response to Thomas's original; two agreed
to work together on this codebase.
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
- Support fetching from foreign VCSes
- Add specification of git-vcs helpers
- Add "vcs" config option in remotes
----------------------------------------------------------------
[Stalled and may need help and prodding to go forward]
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
- autoconf: Enable threaded delta search when pthreads are supported
. autoconf: Enable threaded delta search when pthreads are supported
This automatically enables threaded delta search code when autoconf
detects pthreads are usable. I haven't heard neither positive nor
negative comments from minority platforms that might be harmed, but
this feels like the right thing to do, so perhaps the best course of
action is to merge this down to 'master' and see if anybody screams.
I haven't heard neither positive nor negative comments from minority
platforms that might be harmed, but this feels like the right thing to do,
so perhaps the best course of action is to merge this down to 'master' and
see if anybody screams.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
+ blame: show "previous" information in --porcelain/--incremental
@ -92,86 +98,50 @@ need to be resurrected before this can move forward.
@@ -92,86 +98,50 @@ need to be resurrected before this can move forward.
----------------------------------------------------------------
[Actively cooking]
* gb/gitweb-opml (Fri Jan 2 13:49:30 2009 +0100) 2 commits
+ gitweb: suggest name for OPML view
+ gitweb: don't use pathinfo for global actions
* ks/maint-mailinfo-folded (Mon Jan 12 15:22:11 2009 -0800) 2 commits
- mailinfo: 'From:' header should be unfold as well
- mailinfo: correctly handle multiline 'Subject:' header
The author seems to have more updates, but I couldn't extract them from
the e-mail.
* js/patience-diff (Thu Jan 1 17:39:37 2009 +0100) 3 commits
+ bash completions: Add the --patience option
+ Introduce the diff option '--patience'
+ Implement the patience diff algorithm
* mv/apply-parse-opt (Fri Jan 9 22:21:36 2009 -0800) 2 commits
+ Resurrect "git apply --flags -" to read from the standard input
+ parse-opt: migrate builtin-apply.
* rs/maint-shortlog-foldline (Tue Jan 6 21:41:06 2009 +0100) 1 commit
+ shortlog: handle multi-line subjects like log --pretty=oneline et.
al. do
* tr/rebase-root (Fri Jan 2 23:28:29 2009 +0100) 4 commits
- rebase: update documentation for --root
- rebase -i: learn to rebase root commit
- rebase: learn to rebase root commit
- rebase -i: execute hook only after argument checking
+ rebase: update documentation for --root
+ rebase -i: learn to rebase root commit
+ rebase: learn to rebase root commit
+ rebase -i: execute hook only after argument checking
I should be able to find time to read this over again and merge to
'next' sometime this week.
Looked reasonable.
* as/autocorrect-alias (Sun Jan 4 18:16:01 2009 +0100) 1 commit
+ git.c: make autocorrected aliases work
* js/notes (Sat Dec 20 13:06:03 2008 +0100) 4 commits
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
* js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
+ git-notes: fix printing of multi-line notes
+ notes: fix core.notesRef documentation
+ Add an expensive test for git-notes
+ Speed up git notes lookup
+ Add a script to edit/inspect notes
+ Introduce commit notes
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
- gitweb: Optional grouping of projects by category
- gitweb: Split git_project_list_body in two functions
- gitweb: Modularized git_get_project_description to be more generic
* gb/gitweb-patch (Thu Dec 18 08:13:19 2008 +0100) 4 commits
- gitweb: link to patch(es) view in commit(diff) and (short)log view
- gitweb: add patches view
- gitweb: change call pattern for git_commitdiff
- gitweb: add patch view
----------------------------------------------------------------
[Graduated to "master"]
* mh/maint-sendmail-cc-doc (Mon Dec 29 00:37:25 2008 +0100) 1 commit
+ doc/git-send-email: mention sendemail.cc config variable
* rs/diff-ihc (Sun Dec 28 19:45:32 2008 +0100) 1 commit
+ diff: add option to show context between close hunks
* js/maint-merge-recursive-r-d-conflict (Mon Dec 22 23:10:20 2008 +0100) 1 commit
+ merge-recursive: mark rename/delete conflict as unmerged
* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit
+ gitweb: unify boolean feature subroutines
* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits
+ Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-
recursive-fix
+ merge-recursive: do not clobber untracked working tree garbage
+ modify/delete conflict resolution overwrites untracked file
* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits
+ merge-recursive: do not clobber untracked working tree garbage
+ modify/delete conflict resolution overwrites untracked file
* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits
+ Add 'g' command to go to a hunk
+ Add subroutine to display one-line summary of hunks
* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
+ gitweb: cache $parent_commit info in git_blame()
+ gitweb: A bit of code cleanup in git_blame()
+ gitweb: Move 'lineno' id from link to row element in git_blame
* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
+ Add support for a pdf version of the user manual
* kk/maint-http-push (Tue Dec 23 11:31:15 2008 +0300) 1 commit
+ http-push: support full URI in handle_remote_ls_ctx()
----------------------------------------------------------------
[Will merge to "master" soon]
* nd/grep-assume-unchanged (Sat Dec 27 15:21:03 2008 +0700) 2 commits
+ grep: grep cache entries if they are "assume unchanged"
+ grep: support --no-ext-grep to test builtin grep
@ -219,32 +189,57 @@ I should be able to find time to read this over again and merge to
@@ -219,32 +189,57 @@ I should be able to find time to read this over again and merge to
+ Documentation: clarify which parameters are optional to git-cherry
+ git-cherry: make <upstream> parameter optional
Some of the above will still need to be downmerged to respective
maintenance branches after they are widely used on 'master'.
----------------------------------------------------------------
[Will drop]
[Will merge to "master" soon]
* mh/maint-commit-color-status (Thu Jan 8 19:53:05 2009 +0100) 2 commits
+ git-status -v: color diff output when color.ui is set
+ git-commit: color status output when color.ui is set
* rs/maint-shortlog-foldline (Tue Jan 6 21:41:06 2009 +0100) 1 commit
+ shortlog: handle multi-line subjects like log --pretty=oneline et.
al. do
* as/commit-signoff (Mon Dec 29 12:16:45 2008 +0100) 1 commit
- [WIP] Add a commit.signoff configuration option to always use --
signoff in commit
* rs/fgrep (Sat Jan 10 00:18:34 2009 +0100) 2 commits
+ grep: don't call regexec() for fixed strings
+ grep -w: forward to next possible position after rejected match
The semantics when "git commit" was used as a backend for other actions
such as rebase and cherry-pick was unclear.
* as/autocorrect-alias (Sun Jan 4 18:16:01 2009 +0100) 1 commit
+ git.c: make autocorrected aliases work
* tr/maint-no-index-fixes (Wed Jan 7 12:15:30 2009 +0100) 3 commits
+ diff --no-index -q: fix endless loop
+ diff --no-index: test for pager after option parsing
+ diff: accept -- when using --no-index
* jc/maint-format-patch (Sat Jan 10 12:41:33 2009 -0800) 1 commit
+ format-patch: show patch text for the root commit
* ap/clone-into-empty (Sun Jan 11 15:19:12 2009 +0300) 2 commits
+ Allow cloning to an existing empty directory
+ add is_dot_or_dotdot inline function
* gb/gitweb-patch (Thu Dec 18 08:13:19 2008 +0100) 4 commits
+ gitweb: link to patch(es) view in commit(diff) and (short)log view
+ gitweb: add patches view
+ gitweb: change call pattern for git_commitdiff
+ gitweb: add patch view
----------------------------------------------------------------
[On Hold]
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
. 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.
* 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:
. 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
. stripspace: use parse_options()
. Add "git am -s" test
. git-am: refactor code to add signed-off-by line for the committer
Junio C Hamano
16 years ago