Junio C Hamano
16 years ago
2 changed files with 413 additions and 0 deletions
@ -0,0 +1,245 @@ |
|||||||
|
To: git@vger.kernel.org |
||||||
|
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, #03; Wed, 14) |
||||||
|
-------------------------------------------------- |
||||||
|
|
||||||
|
Here are the topics that have been cooking. Commits prefixed |
||||||
|
with '-' are only in 'pu' while commits prefixed with '+' are |
||||||
|
in 'next'. The ones marked with '.' do not appear in any of the branches, |
||||||
|
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. |
||||||
|
|
||||||
|
---------------------------------------------------------------- |
||||||
|
[New Topics] |
||||||
|
|
||||||
|
* kb/am-directory (Sun Jan 11 22:21:48 2009 -0800) 1 commit |
||||||
|
+ git-am: add --directory=<dir> option |
||||||
|
|
||||||
|
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. |
||||||
|
|
||||||
|
* 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 |
||||||
|
|
||||||
|
* 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 |
||||||
|
|
||||||
|
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. |
||||||
|
|
||||||
|
* 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 |
||||||
|
|
||||||
|
* 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 |
||||||
|
|
||||||
|
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. |
||||||
|
|
||||||
|
* lt/maint-wrap-zlib (Wed Jan 7 19:54:47 2009 -0800) 1 commit |
||||||
|
+ Wrap inflate and other zlib routines for better error reporting |
||||||
|
|
||||||
|
Needs the "free our memory upon seeing Z_MEM_ERROR and try again" bits |
||||||
|
extracted from Shawn's patch on top of this one. |
||||||
|
|
||||||
|
* 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 |
||||||
|
|
||||||
|
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 |
||||||
|
|
||||||
|
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 |
||||||
|
format |
||||||
|
+ git-blame: refactor code to emit "porcelain format" output |
||||||
|
|
||||||
|
This gives Porcelains (like gitweb) the information on the commit _before_ |
||||||
|
the one that the final blame is laid on, which should save them one |
||||||
|
rev-parse to dig further. The line number in the "previous" information |
||||||
|
may need refining, and sanity checking code for reference counting may |
||||||
|
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. |
||||||
|
|
||||||
|
* 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 |
||||||
|
|
||||||
|
Looked reasonable. |
||||||
|
|
||||||
|
* 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 |
||||||
|
|
||||||
|
---------------------------------------------------------------- |
||||||
|
[Graduated to "master"] |
||||||
|
|
||||||
|
* 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 |
||||||
|
|
||||||
|
* as/maint-shortlog-cleanup (Tue Dec 30 22:01:44 2008 +0100) 1 commit |
||||||
|
+ builtin-shortlog.c: use string_list_append(), and don't strdup |
||||||
|
unnecessarily |
||||||
|
|
||||||
|
* jc/maint-ls-tree (Wed Dec 31 19:00:50 2008 +0900) 2 commits |
||||||
|
+ Document git-ls-tree --full-tree |
||||||
|
+ ls-tree: add --full-tree option |
||||||
|
|
||||||
|
* js/bundle-tags (Fri Jan 2 19:08:46 2009 +0100) 1 commit |
||||||
|
+ bundle: allow rev-list options to exclude annotated tags |
||||||
|
|
||||||
|
* js/add-not-submodule (Fri Jan 2 19:08:40 2009 +0100) 1 commit |
||||||
|
+ git add: do not add files from a submodule |
||||||
|
|
||||||
|
* pb/maint-git-pm-false-dir (Mon Dec 29 01:25:00 2008 +0100) 1 commit |
||||||
|
+ Git.pm: correctly handle directory name that evaluates to "false" |
||||||
|
|
||||||
|
* pj/maint-ldflags (Sun Jan 4 21:27:41 2009 -0500) 1 commit |
||||||
|
+ configure clobbers LDFLAGS |
||||||
|
|
||||||
|
* fe/cvsserver (Fri Jan 2 16:40:14 2009 +0100) 2 commits |
||||||
|
+ cvsserver: change generation of CVS author names |
||||||
|
+ cvsserver: add option to configure commit message |
||||||
|
|
||||||
|
* js/maint-bisect-gitk (Fri Jan 2 19:08:00 2009 +0100) 1 commit |
||||||
|
+ bisect view: call gitk if Cygwin's SESSIONNAME variable is set |
||||||
|
|
||||||
|
* np/no-loosen-prune-expire-now (Tue Dec 30 14:45:11 2008 -0500) 1 commit |
||||||
|
+ objects to be pruned immediately don't have to be loosened |
||||||
|
|
||||||
|
* cb/maint-unpack-trees-absense (Thu Jan 1 21:54:33 2009 +0100) 3 commits |
||||||
|
+ unpack-trees: remove redundant path search in verify_absent |
||||||
|
+ unpack-trees: fix path search bug in verify_absent |
||||||
|
+ unpack-trees: handle failure in verify_absent |
||||||
|
|
||||||
|
* mc/cd-p-pwd (Tue Dec 30 07:10:24 2008 -0800) 1 commit |
||||||
|
+ git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on |
||||||
|
OS X |
||||||
|
|
||||||
|
* mh/cherry-default (Thu Jan 1 22:56:29 2009 +0100) 2 commits |
||||||
|
+ 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 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 |
||||||
|
|
||||||
|
* 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 |
||||||
|
|
||||||
|
* 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 |
||||||
|
asked for |
||||||
|
|
||||||
|
* 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 |
||||||
@ -0,0 +1,168 @@ |
|||||||
|
To: git@vger.kernel.org |
||||||
|
Subject: What's in git.git (Jan 2009, #01; Wed, 14) |
||||||
|
X-maint-at: 4f8b8992ef0c009822cdca18d32ddf3a124ee284 |
||||||
|
X-master-at: 3cf3b838c7b379824c68ee87799aaaa9028b36cd |
||||||
|
X-maint-was: 936b7057e8401665a2d106e8de018561db6333fe |
||||||
|
X-master-was: c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf |
||||||
|
|
||||||
|
What's in git.git (Jan 2009, #01; Wed, 14) |
||||||
|
|
||||||
|
maint 4f8b899 (Merge branch 'maint-1.6.0' into maint) |
||||||
|
master 3cf3b83 (Update 1.6.2 draft release notes) |
||||||
|
------------------------------------------------------------------------ |
||||||
|
|
||||||
|
Many topics graduated to 'master' and I updated the draft release notes |
||||||
|
for 1.6.2. |
||||||
|
|
||||||
|
* The 'maint' branch has these fixes since the last announcement. |
||||||
|
|
||||||
|
Clemens Buchacher (1): |
||||||
|
modify/delete conflict resolution overwrites untracked file |
||||||
|
|
||||||
|
Felipe Contreras (1): |
||||||
|
fast-import: Cleanup mode setting. |
||||||
|
|
||||||
|
Henrik Austad (2): |
||||||
|
Use capitalized names where appropriate |
||||||
|
Be consistent in switch usage for tar |
||||||
|
|
||||||
|
Jay Soffian (1): |
||||||
|
Git.pm: call Error::Simple() properly |
||||||
|
|
||||||
|
Joey Hess (1): |
||||||
|
README: tutorial.txt is now called gittutorial.txt |
||||||
|
|
||||||
|
Johannes Schindelin (1): |
||||||
|
merge-recursive: mark rename/delete conflict as unmerged |
||||||
|
|
||||||
|
Junio C Hamano (3): |
||||||
|
merge-recursive: do not clobber untracked working tree garbage |
||||||
|
builtin-apply: prevent non-explicit permission changes |
||||||
|
git checkout: do not allow switching to a tree-ish that is not a commit |
||||||
|
|
||||||
|
Kirill A. Korinskiy (1): |
||||||
|
http-push: support full URI in handle_remote_ls_ctx() |
||||||
|
|
||||||
|
Markus Heidelberg (1): |
||||||
|
doc/git-send-email: mention sendemail.cc config variable |
||||||
|
|
||||||
|
Miklos Vajna (1): |
||||||
|
fast-export: print usage when no options specified |
||||||
|
|
||||||
|
Pierre Habouzit (1): |
||||||
|
Avoid spurious error messages on error mistakes. |
||||||
|
|
||||||
|
jidanni@jidanni.org (3): |
||||||
|
Documentation/git-tag.txt: minor typo and grammar fix |
||||||
|
Documentation/git-push.txt: minor: compress one option |
||||||
|
contrib/examples/README: give an explanation of the status of these files |
||||||
|
|
||||||
|
|
||||||
|
* The 'master' branch has these since the last announcement |
||||||
|
in addition to the above. |
||||||
|
|
||||||
|
Adeodato Simó (2): |
||||||
|
builtin-shortlog.c: use string_list_append(), and don't strdup |
||||||
|
unnecessarily |
||||||
|
t7501-commit.sh: explicitly check that -F prevents invoking the editor |
||||||
|
|
||||||
|
Alexander Potashev (1): |
||||||
|
remove trailing LF in die() messages |
||||||
|
|
||||||
|
Charles Bailey (4): |
||||||
|
Fix some tab/space inconsistencies in git-mergetool.sh |
||||||
|
Add -y/--no-prompt option to mergetool |
||||||
|
mergetool: Add prompt to continue after failing to merge a file |
||||||
|
mergetool: Don't keep temporary merge files unless told to |
||||||
|
|
||||||
|
Christian Couder (1): |
||||||
|
sha1_file: make "read_object" static |
||||||
|
|
||||||
|
Clemens Buchacher (3): |
||||||
|
unpack-trees: handle failure in verify_absent |
||||||
|
unpack-trees: fix path search bug in verify_absent |
||||||
|
unpack-trees: remove redundant path search in verify_absent |
||||||
|
|
||||||
|
Eric Wong (1): |
||||||
|
git-svn: add --authors-file test |
||||||
|
|
||||||
|
Fabian Emmes (2): |
||||||
|
cvsserver: add option to configure commit message |
||||||
|
cvsserver: change generation of CVS author names |
||||||
|
|
||||||
|
Giuseppe Bilotta (1): |
||||||
|
gitweb: use href() when generating URLs in OPML |
||||||
|
|
||||||
|
Jakub Narebski (3): |
||||||
|
gitweb: Move 'lineno' id from link to row element in git_blame |
||||||
|
gitweb: A bit of code cleanup in git_blame() |
||||||
|
gitweb: cache $parent_commit info in git_blame() |
||||||
|
|
||||||
|
Jeff King (1): |
||||||
|
Makefile: clean up TEST_PROGRAMS definition |
||||||
|
|
||||||
|
Johannes Schindelin (5): |
||||||
|
git wrapper: Make while loop more reader-friendly |
||||||
|
bisect view: call gitk if Cygwin's SESSIONNAME variable is set |
||||||
|
bundle: allow rev-list options to exclude annotated tags |
||||||
|
git add: do not add files from a submodule |
||||||
|
show <tag>: reuse pp_user_info() instead of duplicating code |
||||||
|
|
||||||
|
Jon Loeliger (1): |
||||||
|
Fix Documentation typos surrounding the word 'handful'. |
||||||
|
|
||||||
|
Junio C Hamano (2): |
||||||
|
ls-tree: add --full-tree option |
||||||
|
Update 1.6.2 draft release notes |
||||||
|
|
||||||
|
Kjetil Barvik (1): |
||||||
|
Cleanup of unused symcache variable inside diff-lib.c |
||||||
|
|
||||||
|
Lee Marlow (2): |
||||||
|
bash completion: Add '--intent-to-add' long option for 'git add' |
||||||
|
bash completion: Use 'git add' completions for 'git stage' |
||||||
|
|
||||||
|
Marcel M. Cary (1): |
||||||
|
git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X |
||||||
|
|
||||||
|
Markus Heidelberg (3): |
||||||
|
git-cherry: make <upstream> parameter optional |
||||||
|
Documentation: clarify which parameters are optional to git-cherry |
||||||
|
contrib/vim: change URL to point to the latest syntax files |
||||||
|
|
||||||
|
Matt Kraai (1): |
||||||
|
gitweb: unify boolean feature subroutines |
||||||
|
|
||||||
|
Miklos Vajna (1): |
||||||
|
Add support for a pdf version of the user manual |
||||||
|
|
||||||
|
Nanako Shiraishi (1): |
||||||
|
Document git-ls-tree --full-tree |
||||||
|
|
||||||
|
Nguyễn Thái Ngọc Duy (2): |
||||||
|
grep: support --no-ext-grep to test builtin grep |
||||||
|
grep: grep cache entries if they are "assume unchanged" |
||||||
|
|
||||||
|
Nicolas Pitre (1): |
||||||
|
objects to be pruned immediately don't have to be loosened |
||||||
|
|
||||||
|
Paul Jarc (1): |
||||||
|
configure clobbers LDFLAGS |
||||||
|
|
||||||
|
Philippe Bruhat (1): |
||||||
|
Git.pm: correctly handle directory name that evaluates to "false" |
||||||
|
|
||||||
|
Pierre Habouzit (1): |
||||||
|
filter-branch: add git_commit_non_empty_tree and --prune-empty. |
||||||
|
|
||||||
|
René Scharfe (2): |
||||||
|
diff: add option to show context between close hunks |
||||||
|
strbuf: instate cleanup rule in case of non-memory errors |
||||||
|
|
||||||
|
SZEDER Gábor (1): |
||||||
|
bash: add '--merge' to 'git reset' |
||||||
|
|
||||||
|
William Pursell (2): |
||||||
|
Add subroutine to display one-line summary of hunks |
||||||
|
Add 'g' command to go to a hunk |
||||||
|
|
||||||
Loading…
Reference in new issue