Junio C Hamano
16 years ago
2 changed files with 368 additions and 0 deletions
@ -0,0 +1,235 @@
@@ -0,0 +1,235 @@
|
||||
To: git@vger.kernel.org |
||||
Subject: What's cooking in git.git (Jan 2009, #06; Sat, 24) |
||||
X-master-at: 5dc1308562ab5991ecada68b06707709bea408c9 |
||||
X-next-at: 7298c8d081d90e4a3c5161414c17908750ecf5a9 |
||||
|
||||
What's cooking in git.git (Jan 2009, #06; Sat, 24) |
||||
-------------------------------------------------- |
||||
|
||||
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] |
||||
|
||||
* jg/mergetool (Sat Jan 24 00:12:45 2009 +0100) 1 commit |
||||
- [wait for an ack from ted] mergetool: Don't repeat merge tool |
||||
candidates |
||||
|
||||
* cb/mergetool (Wed Jan 21 22:57:48 2009 +0000) 1 commit |
||||
- [wait for ack from ted] mergetool: respect autocrlf by using |
||||
checkout-index |
||||
|
||||
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits |
||||
- git commit: pathspec without -i/-o implies -i semantics during a |
||||
merge |
||||
- builtin-commit: shorten eye-sore overlong lines |
||||
- Add "partial commit" tests during a conflicted merge |
||||
|
||||
This is only meant as a weatherballoon to help facilitate discussion. |
||||
|
||||
* sr/clone-empty (Fri Jan 23 01:07:32 2009 +0100) 1 commit |
||||
+ Allow cloning an empty repository |
||||
|
||||
At last ;-) This is a reasonable thing to do, and should be fast tracked |
||||
to 'master'. |
||||
|
||||
* cc/replace (Fri Jan 23 10:07:46 2009 +0100) 7 commits |
||||
- environment: add global variable to disable replacement |
||||
- mktag: call "check_sha1_signature" with the replacement sha1 |
||||
- replace_object: add a test case |
||||
- object: call "check_sha1_signature" with the replacement sha1 |
||||
- sha1_file: add a "read_sha1_file_repl" function |
||||
- replace_object: add mechanism to replace objects found in |
||||
"refs/replace/" |
||||
- refs: add a "for_each_replace_ref" function |
||||
|
||||
---------------------------------------------------------------- |
||||
[Stalled and may need help and prodding to go forward] |
||||
|
||||
* 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. |
||||
|
||||
* 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 |
||||
|
||||
The "spec" did not seem quite well cooked yet, but in the longer term I |
||||
think something like this to allow interoperating with other SCMs as if |
||||
the other end is a native git repository is a very worthy goal. |
||||
|
||||
---------------------------------------------------------------- |
||||
[Reverted] |
||||
|
||||
* mh/unify-color (Fri Jan 23 01:25:23 2009 -0800) 3 commits |
||||
? Revert previous two commits |
||||
? move the color variables to color.c |
||||
? handle color.ui at a central place |
||||
|
||||
This broke git-format-patch badly. |
||||
|
||||
---------------------------------------------------------------- |
||||
[Actively cooking] |
||||
|
||||
* js/valgrind (Wed Jan 21 02:36:40 2009 +0100) 2 commits |
||||
- valgrind: ignore ldso errors |
||||
- Add valgrind support in test scripts |
||||
|
||||
Dscho seems to have some updates out of discussion with Peff, which is not |
||||
queued here. |
||||
|
||||
* sp/runtime-prefix (Sun Jan 18 13:00:15 2009 +0100) 7 commits |
||||
- Windows: Revert to default paths and convert them by |
||||
RUNTIME_PREFIX |
||||
- Compute prefix at runtime if RUNTIME_PREFIX is set |
||||
- Modify setup_path() to only add git_exec_path() to PATH |
||||
- Add calls to git_extract_argv0_path() in programs that call |
||||
git_config_* |
||||
- git_extract_argv0_path(): Move check for valid argv0 from caller |
||||
to callee |
||||
- Refactor git_set_argv0_path() to git_extract_argv0_path() |
||||
- Move computation of absolute paths from Makefile to runtime (in |
||||
preparation for RUNTIME_PREFIX) |
||||
|
||||
We should move this to 'next' soon with J6t's blessing. |
||||
|
||||
* 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 |
||||
|
||||
There were a few updates posted, which I haven't picked up. |
||||
|
||||
* jk/signal-cleanup (Thu Jan 22 01:03:28 2009 -0500) 5 commits |
||||
- pager: do wait_for_pager on signal death |
||||
- refactor signal handling for cleanup functions |
||||
- chain kill signals for cleanup functions |
||||
- diff: refactor tempfile cleanup handling |
||||
- Windows: Fix signal numbers |
||||
|
||||
Ready for 'next', but not tonight (yet). |
||||
|
||||
* ks/maint-mailinfo-folded (Tue Jan 13 01:21:04 2009 +0300) 5 commits |
||||
- mailinfo: tests for RFC2047 examples |
||||
- mailinfo: add explicit test for mails like '<a.u.thor@example.com> |
||||
(A U Thor)' |
||||
- mailinfo: more smarter removal of rfc822 comments from 'From' |
||||
+ mailinfo: 'From:' header should be unfold as well |
||||
+ mailinfo: correctly handle multiline 'Subject:' header |
||||
|
||||
As far as I can see, the only remaining thing is a minor fix-up in the |
||||
"comment removal" one before we can move this fully to 'next'. |
||||
|
||||
* 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 |
||||
|
||||
It would be nice to hear a real world success story using the notes |
||||
mechanism; Dscho says he also wants to make sure the current choice |
||||
of the structure scales well before casting it in stone. |
||||
|
||||
* 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 |
||||
|
||||
Design discussion between Jakub and Sebastien continues. |
||||
|
||||
---------------------------------------------------------------- |
||||
[Graduated to "master"] |
||||
|
||||
* 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 |
||||
|
||||
---------------------------------------------------------------- |
||||
[Will merge to "master" soon] |
||||
|
||||
* kb/lstat-cache (Sun Jan 18 16:14:54 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/previous-branch (Wed Jan 21 00:37:38 2009 -0800) 10 commits |
||||
+ Simplify parsing branch switching events in reflog |
||||
+ Introduce for_each_recent_reflog_ent(). |
||||
+ interpret_nth_last_branch(): plug small memleak |
||||
+ Fix reflog parsing for a malformed branch switching entry |
||||
+ Fix parsing of @{-1}@{1} |
||||
+ interpret_nth_last_branch(): avoid traversing the reflog twice |
||||
+ checkout: implement "-" abbreviation, add docs and tests |
||||
+ sha1_name: support @{-N} syntax in get_sha1() |
||||
+ sha1_name: tweak @{-N} lookup |
||||
+ checkout: implement "@{-N}" shortcut name for N-th last branch |
||||
|
||||
* js/maint-all-implies-HEAD (Sat Jan 17 22:27:08 2009 -0800) 2 commits |
||||
+ bundle: allow the same ref to be given more than once |
||||
+ revision walker: include a detached HEAD in --all |
||||
|
||||
* cb/add-pathspec (Wed Jan 14 15:54:35 2009 +0100) 2 commits |
||||
+ remove pathspec_match, use match_pathspec instead |
||||
+ clean up pathspec matching |
||||
|
||||
* js/diff-color-words (Tue Jan 20 22:59:54 2009 -0600) 9 commits |
||||
+ Change the spelling of "wordregex". |
||||
+ color-words: Support diff.wordregex config option |
||||
+ color-words: make regex configurable via attributes |
||||
+ color-words: expand docs with precise semantics |
||||
+ color-words: enable REG_NEWLINE to help user |
||||
+ color-words: take an optional regular expression describing words |
||||
+ color-words: change algorithm to allow for 0-character word |
||||
boundaries |
||||
+ color-words: refactor word splitting and use ALLOC_GROW() |
||||
+ Add color_fwrite_lines(), a function coloring each line |
||||
individually |
||||
|
||||
---------------------------------------------------------------- |
||||
[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 |
||||
|
||||
* 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 |
||||
|
||||
* jk/valgrind (Thu Oct 23 04:30:45 2008 +0000) 2 commits |
||||
. valgrind: ignore ldso errors |
||||
. add valgrind support in test scripts |
||||
|
||||
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits |
||||
. In add --patch, Handle K,k,J,j slightly more gracefully. |
||||
. Add / command in add --patch |
||||
. git-add -i/-p: Change prompt separater from slash to comma |
||||
@ -0,0 +1,133 @@
@@ -0,0 +1,133 @@
|
||||
To: git@vger.kernel.org |
||||
Subject: What's in git.git (Jan 2009, #03; Sat, 24) |
||||
X-maint-at: 692be9f365be09160f8baa1d6d521d0f65ec4cf9 |
||||
X-master-at: 5dc1308562ab5991ecada68b06707709bea408c9 |
||||
X-maint-was: 9d3043cf333ee500e476a558acb234b42e43cc62 |
||||
X-master-was: 28da86a58d7861626eb9d33a1bcfa3e1e79a4d13 |
||||
|
||||
What's in git.git (Jan 2009, #03; Sat, 24) |
||||
|
||||
maint 692be9f (Merge branch 'cb/maint-unpack-trees-absense' into maint) |
||||
master 5dc1308 (Merge branch 'js/patience-diff') |
||||
------------------------------------------------------------------------ |
||||
|
||||
* The 'maint' branch has these fixes since the last announcement. |
||||
|
||||
Anders Melchiorsen (4): |
||||
Documentation: git push repository can also be a remote |
||||
Documentation: remove a redundant elaboration |
||||
Documentation: mention branches rather than heads |
||||
Documentation: avoid using undefined parameters |
||||
|
||||
Boyd Stephen Smith Jr (1): |
||||
Fix Documentation for git-describe |
||||
|
||||
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 |
||||
|
||||
Johannes Schindelin (3): |
||||
bisect view: call gitk if Cygwin's SESSIONNAME variable is set |
||||
git add: do not add files from a submodule |
||||
Rename diff.suppress-blank-empty to diff.suppressBlankEmpty |
||||
|
||||
Junio C Hamano (1): |
||||
format-patch: show patch text for the root commit |
||||
|
||||
Lars Noschinski (1): |
||||
shell: Document that 'cvs server' is a valid command |
||||
|
||||
Paul Jarc (1): |
||||
configure clobbers LDFLAGS |
||||
|
||||
Philippe Bruhat (1): |
||||
Git.pm: correctly handle directory name that evaluates to "false" |
||||
|
||||
René Scharfe (1): |
||||
shortlog: handle multi-line subjects like log --pretty=oneline et. al. do |
||||
|
||||
Thomas Rast (3): |
||||
diff: accept -- when using --no-index |
||||
diff --no-index: test for pager after option parsing |
||||
diff --no-index -q: fix endless loop |
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement |
||||
in addition to the above. |
||||
|
||||
Arjen Laarhoven (1): |
||||
t/t4202-log.sh: Add testcases |
||||
|
||||
Björn Steinbrink (1): |
||||
Rename detection: Avoid repeated filespec population |
||||
|
||||
Brandon Casey (1): |
||||
Makefile: use shell for-loop rather than Make's foreach loop during |
||||
install |
||||
|
||||
Jeff King (2): |
||||
color: make it easier for non-config to parse color specs |
||||
expand --pretty=format color options |
||||
|
||||
Johannes Schindelin (3): |
||||
Implement the patience diff algorithm |
||||
Introduce the diff option '--patience' |
||||
bash completions: Add the --patience option |
||||
|
||||
Jonas Flodén (1): |
||||
git-am: Make it easier to see which patch failed |
||||
|
||||
Junio C Hamano (4): |
||||
git-am: add --directory=<dir> option |
||||
Teach format-patch to handle output directory relative to cwd |
||||
git-am: fix shell quoting |
||||
git-am: re-fix the diag message printing |
||||
|
||||
Keith Cascio (2): |
||||
test more combinations of ignore-whitespace options to diff |
||||
Fix combined use of whitespace ignore options to diff |
||||
|
||||
Linus Torvalds (1): |
||||
Wrap inflate and other zlib routines for better error reporting |
||||
|
||||
Markus Heidelberg (4): |
||||
contrib/difftool: change trap condition from SIGINT to INT |
||||
contrib/difftool: remove distracting 'echo' in the SIGINT handler |
||||
use uppercase POSIX compliant signals for the 'trap' command |
||||
bash completion: add 'rename' subcommand to git-remote |
||||
|
||||
Ralf Wildenhues (1): |
||||
Fix naming scheme for configure cache variables. |
||||
|
||||
Ray Chuan (1): |
||||
http-push: refactor lock-related headers creation for curl requests |
||||
|
||||
René Scharfe (5): |
||||
Add ctype test |
||||
Reformat ctype.c |
||||
Change NUL char handling of isspecial() |
||||
Add is_regex_special() |
||||
Optimize color_parse_mem |
||||
|
||||
SZEDER Gábor (1): |
||||
Fix gitdir detection when in subdir of gitdir |
||||
|
||||
Santi Béjar (2): |
||||
commit: more compact summary and without extra quotes |
||||
tutorial-2: Update with the new "git commit" ouput |
||||
|
||||
Stephan Beyer (5): |
||||
checkout: don't crash on file checkout before running post-checkout hook |
||||
Move run_hook() from builtin-commit.c into run-command.c (libgit) |
||||
api-run-command.txt: talk about run_hook() |
||||
run_hook(): check the executability of the hook before filling argv |
||||
run_hook(): allow more than 9 hook arguments |
||||
|
||||
Thomas Rast (2): |
||||
bash completion: move pickaxe options to log |
||||
bash completion: refactor diff options |
||||
|
||||
martin f. krafft (1): |
||||
git-am: implement --reject option passed to git-apply |
||||
|
||||
Loading…
Reference in new issue