
2 changed files with 280 additions and 0 deletions
@ -0,0 +1,149 @@
@@ -0,0 +1,149 @@
|
||||
What's cooking in git.git (Aug 2008, #01; Tue, 05) |
||||
-------------------------------------------------- |
||||
|
||||
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. |
||||
|
||||
Due to increased activity level from people including GSoC students, I |
||||
expect 'next' to stay somewhat more active than previous rounds during the |
||||
1.6.0-rc cycle. The request for people who usually follow 'next' is the |
||||
same as usual, though. After -rc1 is tagged, please run 'master' for your |
||||
daily git use instead, in order to make sure 'master' does what it claims |
||||
to do without regression. |
||||
|
||||
Tentative schedule, my wishful thinking: |
||||
|
||||
- 1.6.0-rc2 (Aug 6) |
||||
- 1.6.0-rc3 (Aug 10) |
||||
|
||||
---------------------------------------------------------------- |
||||
[New Topics] |
||||
|
||||
* jc/post-simplify (Sun Aug 3 17:47:16 2008 -0700) 3 commits |
||||
+ Topo-sort before --simplify-merges |
||||
+ revision traversal: show full history with merge simplification |
||||
+ revision.c: whitespace fix |
||||
|
||||
"log --full-history" is with too much clutter, "log" itself is too cleverer |
||||
than some people, and here is the middle level of merge simplification. |
||||
|
||||
* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits |
||||
- [do not merge -- original version] Add Git-aware CGI for Git-aware |
||||
smart HTTP transport |
||||
- Add backdoor options to receive-pack for use in Git-aware CGI |
||||
|
||||
The "magic" detection protocol was revised to use POST to info/refs; the |
||||
top one queued is from before that discussion. |
||||
|
||||
* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits |
||||
- add: refuse to add working tree items beyond symlinks |
||||
- update-index: refuse to add working tree items beyond symlinks |
||||
|
||||
The performance impact of this needs to be discussed in a separate |
||||
thread. |
||||
|
||||
* dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits |
||||
+ add --no-filters option to git hash-object |
||||
+ add --path option to git hash-object |
||||
+ use parse_options() in git hash-object |
||||
+ correct usage help string for git-hash-object |
||||
+ correct argument checking test for git hash-object |
||||
+ teach index_fd to work with pipes |
||||
|
||||
Gives a bit more flexibility to hash-objects by allowing us to lie about |
||||
the path the contents comes from. |
||||
|
||||
* jn/svn-log (Sun Aug 3 14:07:21 2008 +0200) 1 commit |
||||
- git-svn: --clean-changelog=<style> to sanitize messages |
||||
|
||||
Eric firmly rejected this one so I won't be merging this to 'next' but |
||||
this was an interesting firestarter for discussion nevertheless. |
||||
|
||||
---------------------------------------------------------------- |
||||
[On Hold and/or Cooking] |
||||
|
||||
* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit |
||||
+ archive: allow --exec and --remote without equal sign |
||||
|
||||
None of the following is for 1.6.0. |
||||
|
||||
* mv/merge-custom (Sat Aug 2 10:08:38 2008 +0200) 6 commits |
||||
+ Builtin git-help. |
||||
+ builtin-help: always load_command_list() in cmd_help() |
||||
+ Add a second testcase for handling invalid strategies in git-merge |
||||
+ Add a new test for using a custom merge strategy |
||||
+ builtin-merge: allow using a custom strategy |
||||
+ builtin-help: make some internal functions available to other |
||||
builtins |
||||
|
||||
* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits |
||||
- git-merge-octopus: use (merge-base A (merge B C D E...)) for |
||||
stepwise merge |
||||
+ merge-base-many: add trivial tests based on the documentation |
||||
+ documentation: merge-base: explain "git merge-base" with more than |
||||
2 args |
||||
+ merge-base: teach "git merge-base" to drive underlying |
||||
merge_bases_many() |
||||
|
||||
* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits |
||||
+ Documentation: Improve documentation for git-imap-send(1) |
||||
+ imap-send.c: more style fixes |
||||
+ imap-send.c: style fixes |
||||
+ git-imap-send: Support SSL |
||||
+ git-imap-send: Allow the program to be run from subdirectories of |
||||
a git tree |
||||
|
||||
Some people seem to prefer having this feature available also with gnutls. |
||||
Such an enhancement can be done in-tree on top of this series if they are |
||||
so inclined. |
||||
|
||||
* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits |
||||
- bisect: only check merge bases when needed |
||||
- bisect: test merge base if good rev is not an ancestor of bad rev |
||||
|
||||
The first one alone does not pass its self-test but combined together they |
||||
seem to. It does not build confidence as the latter one is supposed to be |
||||
an optimization only. |
||||
|
||||
* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits |
||||
+ builtin-add.c: optimize -A option and "git add ." |
||||
+ builtin-add.c: restructure the code for maintainability |
||||
|
||||
* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits |
||||
+ spawn pager via run_command interface |
||||
+ run-command: add pre-exec callback |
||||
|
||||
This changes the parent-child relationship between the pager and the git |
||||
process. We used to make pager the parent which meant that the exit |
||||
status from git is lost from the caller. |
||||
|
||||
* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit |
||||
+ Enable threaded delta search on *BSD and Linux. |
||||
|
||||
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit |
||||
+ merge: remove deprecated summary and diffstat options and config |
||||
variables |
||||
|
||||
This was previously in "will be in master soon" category, but it turns out |
||||
that the synonyms to the ones this one deletes are fairly new invention |
||||
that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps |
||||
in 1.7.0. |
||||
|
||||
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits |
||||
+ Revert "Make clients ask for "git program" over ssh and local |
||||
transport" |
||||
+ Make clients ask for "git program" over ssh and local transport |
||||
|
||||
This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0 |
||||
timeframe. |
||||
|
||||
* 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. |
@ -0,0 +1,131 @@
@@ -0,0 +1,131 @@
|
||||
What's in git.git (Aug 2008, #01; Tue, 05) |
||||
|
||||
maint 2d0f5f3 (RelNotes 1.5.6.5 updates, 2008-08-05) |
||||
master ddd63e6 (Optimize sha1_object_info for loose objects, not concurrent repacks, 2008-08-05) |
||||
------------------------------------------------------------------------ |
||||
Thanks to many people, we have accumulated quite a few fixes that are |
||||
appropriate for 1.6.0 stabilization effort but at the same time apply |
||||
equally well to 1.5.6 series. We might want to do 1.5.6.5 to flush them |
||||
while we are at it. |
||||
|
||||
I am planning to tag 1.6.0-rc2 tomorrow evening. I noticed that both gitk |
||||
and git-gui have fixes and many updated translations that I intend to |
||||
pull before tagging -rc2. |
||||
|
||||
* The 'maint' branch has these fixes since the last announcement. |
||||
|
||||
Anders Melchiorsen (1): |
||||
Documentation: fix diff.external example |
||||
|
||||
Brandon Casey (1): |
||||
t/t4202-log.sh: add newline at end of file |
||||
|
||||
Ciaran McCreesh (1): |
||||
Make git-add -i accept ranges like 7- |
||||
|
||||
Jeff King (1): |
||||
init: handle empty "template" parameter |
||||
|
||||
Jim Meyering (1): |
||||
git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout. |
||||
|
||||
Johannes Schindelin (1): |
||||
sort_in_topological_order(): avoid setting a commit flag |
||||
|
||||
Jonathan Nieder (1): |
||||
git-diff(1): "--c" -> "--cc" typo fix |
||||
|
||||
Junio C Hamano (6): |
||||
make sure parsed wildcard refspec ends with slash |
||||
Documentation: clarify diff --cc |
||||
Update my e-mail address |
||||
Start 1.5.6.5 RelNotes to describe accumulated fixes |
||||
builtin-name-rev.c: split deeply nested part from the main function |
||||
RelNotes 1.5.6.5 updates |
||||
|
||||
Linus Torvalds (1): |
||||
diff.renamelimit is a basic diff configuration |
||||
|
||||
Mike Ralphson (1): |
||||
Documentation: typos / spelling fixes in older RelNotes |
||||
|
||||
Pierre Habouzit (1): |
||||
git-submodule: move ill placed shift. |
||||
|
||||
Pieter de Bie (1): |
||||
git-name-rev: allow --name-only in combination with --stdin |
||||
|
||||
René Scharfe (1): |
||||
git-name-rev: don't use printf without format |
||||
|
||||
Stephan Beyer (1): |
||||
builtin-revert.c: typofix |
||||
|
||||
Steve Haslam (1): |
||||
Propagate -u/--upload-pack option of "git clone" to transport. |
||||
|
||||
|
||||
* The 'master' branch has these since the last announcement |
||||
in addition to the above. |
||||
|
||||
Abhijit Menon-Sen (4): |
||||
Git.pm: localise $? in command_close_bidi_pipe() |
||||
Fix hash slice syntax error |
||||
Fix typo in perl/Git.pm |
||||
Fix typos in INSTALL |
||||
|
||||
Anders Melchiorsen (2): |
||||
Flush output in start_async |
||||
Add output flushing before fork() |
||||
|
||||
Avery Pennarun (2): |
||||
Teach "git diff -p" Pascal/Delphi funcname pattern |
||||
git-svn: Abort with an error if 'fetch' parameter is invalid. |
||||
|
||||
Brandon Casey (1): |
||||
Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long |
||||
|
||||
David D. Kilzer (1): |
||||
Fix race condition in t9119-git-svn-info.sh |
||||
|
||||
Dmitry Potapov (1): |
||||
correct access right for git-svn-dcommit test |
||||
|
||||
Eric Wong (2): |
||||
git-svn: properly set path for "info" command |
||||
t9119: conditionally re-enable test depending on svn(1) version |
||||
|
||||
Giuseppe Bilotta (2): |
||||
diff: add ruby funcname pattern |
||||
diff: chapter and part in funcname for tex |
||||
|
||||
Johannes Schindelin (2): |
||||
clone: Add an option to set up a mirror |
||||
clone --bare: Add ".git" suffix to the directory name to clone into |
||||
|
||||
Jon Jensen (1): |
||||
Fix reference to Everyday Git, which is an HTML document and not a man |
||||
page. |
||||
|
||||
Lee Marlow (11): |
||||
bash completion: remove unused function _git_diff_tree |
||||
bash completion: Add more long options for 'git log' |
||||
bash completion: Add completion for 'git grep' |
||||
bash completion: Add completion for 'git clone' |
||||
bash completion: Add completion for 'git clean' |
||||
bash completion: Add completion for 'git init' |
||||
bash completion: Add completion for 'git revert' |
||||
bash completion: More completions for 'git stash' |
||||
bash completion: Add completion for 'git archive' |
||||
bash completion: Add completion for 'git ls-files' |
||||
bash completion: Add completion for 'git mv' |
||||
|
||||
Mike Ralphson (1): |
||||
Documentation: typos / spelling fixes |
||||
|
||||
Steffen Prohaska (1): |
||||
Modify mingw_main() workaround to avoid link errors |
||||
|
||||
Steven Grimm (1): |
||||
Optimize sha1_object_info for loose objects, not concurrent repacks |
||||
|
Loading…
Reference in new issue