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.
It's been a while since the last issue of this series. I've been
swamped, and haven't had a chance to spend enough time on reviewing and
accepting patches.
A rough timeline from now on.
* Fixes of 'master' continues, with newer -rcX tagged every once in a
while.
* 1.5.6 Final (2008-06-08 -- likely to slip by a week or so, though).
There are a few known breakages I want to see addressed that are not in
here before 1.5.6 (no not any new features but pure bugfixes).
----------------------------------------------------------------
[New Topics]
* jc/checkout (Wed May 28 16:11:16 2008 -0700) 5 commits
- PARK: NUL hack to entry
- checkout: "best effort" checkout
- unpack_trees(): allow callers to differentiate worktree errors
from merge errors
- checkout: consolidate reset_{to_new,clean_to_new|()
- checkout: make reset_clean_to_new() not die by itself
* lr/init-bare (Wed May 28 19:53:57 2008 +0100) 1 commit
- git-init: accept --bare option
This makes both "git --bare init" and "git init --bare" work, which would
reduce confusion. I am tempted to include it in 1.5.6. Comments?
----------------------------------------------------------------
[Graduated to "master"]
* jc/diff-no-no-index (Mon May 26 22:35:07 2008 -0700) 5 commits
+ git diff --no-index: default to page like other diff frontends
+ git-diff: allow --no-index semantics a bit more
+ "git diff": do not ignore index without --no-index
+ diff-files: do not play --no-index games
+ tests: do not use implicit "git diff --no-index"
This was done in response to recently discovered interaction with stgit;
we were too eater to invoke --no-index behaviour without being asked.
----------------------------------------------------------------
[Stalled]
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
+ "git push": tellme-more protocol extension
Allows common ancestor negotiation for git-push to help people with shared
repository workflow in certain minority situations. The lack of protocol
support has been bugging me for quite some time, and that was the reason I
did this.
This needs debugging.
* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
+ git-blame --reverse
+ builtin-blame.c: allow more than 16 parents
+ builtin-blame.c: move prepare_final() into a separate function.
+ rev-list --children
+ revision traversal: --children option
The blame that finds where each line in the original lines moved to. This
may help a GSoC project that wants to gather statistical overview of the
history. The final presentation may need tweaking (see the log message of
the tip commit on the series).
* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits
+ Use perl instead of tac
+ Fix t3404 assumption that `wc -l` does not use whitespace.
+ rebase -i: Use : in expr command instead of match.
+ rebase -i: update the implementation of 'mark' command
+ Add option --preserve-tags
+ Teach rebase interactive the tag command
+ Add option --first-parent
+ Do rebase with preserve merges with advanced TODO list
+ Select all lines with fake-editor
+ Unify the length of $SHORT* and the commits in the TODO list
+ Teach rebase interactive the merge command
+ Move redo merge code in a function
+ Teach rebase interactive the reset command
+ Teach rebase interactive the mark command
+ Move cleanup code into it's own function
+ Don't append default merge message to -m message
+ fake-editor: output TODO list if unchanged
This may complement the proposed "sequencer" GSoC project. Dscho seems to
have quite a strong objection to the 'mark' syntax and mechanism being
unnecessarily complex. Let's wait and see if a less complex but equally
expressive alternative materializes...
* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits
- Introduce fast forward option only
- Head reduction before selecting merge strategy
- Restructure git-merge.sh
- Introduce -ff=<fast forward option>
- New merge tests
- Documentation for joining more than two histories
This will interfere with Miklos's rewrite of merge to C but it appears
neither will happen by 1.5.6 anyway.
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
- Eliminate an unnecessary chdir("..")
- Add support for GIT_CEILING_DIRECTORIES
- Fold test-absolute-path into test-path-utils
- Implement normalize_absolute_path
----------------------------------------------------------------
[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
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.
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
- merge: remove deprecated summary and diffstat options and config
variables
This needs to be held back, as it actually removes the support for
features that the main part of the series deprecates, until 1.6.0 or
later.
* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
- Move all dashed-form commands to libexecdir
Scheduled for 1.6.0.
* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits
- Prepare execv_git_cmd() for removal of builtins from the
filesystem
- git-shell: accept "git foo" form
We do not plan to remove git-foo form completely from the filesystem at
this point, but git-shell may need to be updated.
* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits
- WIP: rethink replay merge
- Start using replay-tree merge in cherry-pick
- revert/cherry-pick: start refactoring call to merge_recursive
This is meant to improve cherry-pick's behaviour when renames are
involved, by not using merge-recursive (whose d/f conflict resolution is
quite broken), but unfortunately has stalled for some time 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:
lines
- stripspace: use parse_options()
- Add "git am -s" test
- git-am: refactor code to add signed-off-by line for the committer
Just my toy at this moment.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
