|
|
|
|
What's cooking in git.git (Jul 2008, #11; Thu, 31)
|
|
|
|
|
--------------------------------------------------
|
|
|
|
|
|
|
|
|
|
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 3)
|
|
|
|
|
- 1.6.0-rc3 (Aug 10)
|
|
|
|
|
|
|
|
|
|
----------------------------------------------------------------
|
|
|
|
|
[New Topics]
|
|
|
|
|
|
|
|
|
|
* 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 (Thu Jul 31 00:38:07 2008 +0200) 5 commits
|
|
|
|
|
+ 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()
|
|
|
|
|
|
|
|
|
|
* jc/simplify-merges (Thu Jul 31 01:17:41 2008 -0700) 1 commit
|
|
|
|
|
. revision traversal: show full history with merge simplification
|
|
|
|
|
|
|
|
|
|
"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.
|
|
|
|
|
|
|
|
|
|
----------------------------------------------------------------
|
|
|
|
|
[On Hold and/or Cooking]
|
|
|
|
|
|
|
|
|
|
None of the following is for 1.6.0.
|
|
|
|
|
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* 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.
|
