mirror of
https://github.com/git/git.git
synced 2026-01-27 09:17:21 +09:00
What's cooking (2008/07 #04)
This commit is contained in:
Junio C Hamano
parent
ff9d22a66a
commit
62708729f5
@ -1,6 +1,6 @@
|
||||
Subject: What's cooking in git.git (Jul 2008, issue #03; Mon, 07)
|
||||
Subject: What's cooking in git.git (Jul 2008, issue #04; Wed, 09)
|
||||
|
||||
What's cooking in git.git (Jul 2008, issue #03; Mon, 07)
|
||||
What's cooking in git.git (Jul 2008, issue #04; Wed, 09)
|
||||
--------------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
@ -11,25 +11,20 @@ The topics list the commits in reverse chronological order. The topics
|
||||
meant to be applied to the maintenance series have "maint-" in their
|
||||
names.
|
||||
|
||||
It already is beginning to become clear what 1.6.0 will look like. Wha=
|
||||
t's
|
||||
It already is beginning to become clear what 1.6.0 will look like. What's
|
||||
already in 'next' all are well intentioned (I do not guarantee they are
|
||||
already bug-free --- that is what cooking them in 'next' is for) and ar=
|
||||
e
|
||||
already bug-free --- that is what cooking them in 'next' is for) and are
|
||||
good set of feature enhancements. Bigger changes will be:
|
||||
|
||||
* Port for MinGW.
|
||||
|
||||
* With the default Makefile settings, most of the programs will be
|
||||
installed outside your $PATH, except for "git", "gitk", "git-gui" an=
|
||||
d
|
||||
installed outside your $PATH, except for "git", "gitk", "git-gui" and
|
||||
some server side programs that need to be accessible for technical
|
||||
reasons. Invoking a git subcommand as "git-xyzzy" from the command
|
||||
line has been deprecated since early 2006 (and officially announced =
|
||||
in
|
||||
line has been deprecated since early 2006 (and officially announced in
|
||||
1.5.4 release notes); use of them from your scripts after adding
|
||||
output from "git --exec-path" to the $PATH will still be supported i=
|
||||
n
|
||||
output from "git --exec-path" to the $PATH will still be supported in
|
||||
1.6.0, but users are again strongly encouraged to adjust their
|
||||
scripts to use "git xyzzy" form, as we will stop installing
|
||||
"git-xyzzy" hardlinks for built-in commands in later releases.
|
||||
@ -47,15 +42,36 @@ n
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/rebase-orig-head (Mon Jul 7 00:16:38 2008 -0700) 1 commit
|
||||
+ Teach "am" and "rebase" to mark the original position with
|
||||
ORIG_HEAD
|
||||
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
|
||||
+ Teach git-merge -X<option> again.
|
||||
+ Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
|
||||
+ builtin-merge.c: use parse_options_step() "incremental parsing"
|
||||
machinery
|
||||
+ Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
|
||||
|
||||
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
|
||||
. Migrate git-am to use git-sequencer
|
||||
. Add git-sequencer test suite (t3350)
|
||||
. Add git-sequencer prototype documentation
|
||||
. Add git-sequencer shell prototype
|
||||
I've described what this is in a separate message.
|
||||
|
||||
* jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits
|
||||
+ branch --merged/--no-merged: allow specifying arbitrary commit
|
||||
+ branch --contains: default to HEAD
|
||||
+ parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
|
||||
|
||||
This builds on top of the parse-options enhancement series that
|
||||
has been cooking in 'next' for some time.
|
||||
|
||||
* 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
|
||||
|
||||
* om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit
|
||||
+ builtin-rerere: more carefully find conflict markers
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit
|
||||
+ Allow cherry-picking root commits
|
||||
@ -64,39 +80,13 @@ n
|
||||
+ Teach git-bundle to read revision arguments from stdin like git-
|
||||
rev-list.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to master soon]
|
||||
|
||||
* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits
|
||||
+ git-apply --directory: make --root more similar to GNU diff
|
||||
+ apply --root: thinkofix.
|
||||
+ Teach "git apply" to prepend a prefix with "--root=3D<root>"
|
||||
|
||||
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
|
||||
+ Make default expiration period of reflog used for stash infinite
|
||||
+ Per-ref reflog expiry configuration
|
||||
|
||||
As 1.6.0 will be a good time to make backward incompatible changes, the
|
||||
tip commit makes the default expiry period of stash 'never', unless you
|
||||
configure them to expire explicitly using gc.refs/stash.* variables.
|
||||
Needs consensus, but I am guessing that enough people would want stash
|
||||
that does not expire.
|
||||
|
||||
* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
|
||||
+ Allow per-command pager config
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* sg/stash-k-i (Fri Jun 27 16:37:15 2008 +0200) 1 commit
|
||||
* sg/stash-k-i (Tue Jul 8 00:40:56 2008 -0700) 2 commits
|
||||
+ Documentation: tweak use case in "git stash save --keep-index"
|
||||
+ stash: introduce 'stash save --keep-index' option
|
||||
|
||||
One weakness of our "partial commit" workflow support used to be that t=
|
||||
he
|
||||
user can incrementally build what is to be committed in the index but t=
|
||||
hat
|
||||
state cannot be tested as a whole in the working tree. This allows you=
|
||||
to
|
||||
One weakness of our "partial commit" workflow support used to be that the
|
||||
user can incrementally build what is to be committed in the index but that
|
||||
state cannot be tested as a whole in the working tree. This allows you to
|
||||
temporarily stash the remaining changes in the working tree so that the
|
||||
index state before running "stash save --keep-index" can be seen in the
|
||||
working tree to be tested and then committed.
|
||||
@ -122,10 +112,42 @@ Adds 'e/dit' action to interactive add command.
|
||||
+ git-status: show the remote tracking statistics
|
||||
+ Refactor "tracking statistics" code used by "git checkout"
|
||||
|
||||
Makes the "your branch is ahead of the tracked one by N commits" logic =
|
||||
and
|
||||
Makes the "your branch is ahead of the tracked one by N commits" logic and
|
||||
messages available to other commands; status and branch are updated.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits
|
||||
+ Documentation: mention ORIG_HEAD in am, merge, and rebase
|
||||
+ Teach "am" and "rebase" to mark the original position with
|
||||
ORIG_HEAD
|
||||
|
||||
* ph/parseopt-step-blame (Wed Jul 9 23:38:34 2008 +0200) 18 commits
|
||||
+ revisions: refactor handle_revision_opt into parse_revision_opt.
|
||||
+ git-shortlog: migrate to parse-options partially.
|
||||
+ git-blame: fix lapsus
|
||||
+ git-blame: migrate to incremental parse-option [2/2]
|
||||
+ git-blame: migrate to incremental parse-option [1/2]
|
||||
+ revisions: split handle_revision_opt() from setup_revisions()
|
||||
+ Merge branch 'jc/blame' (early part) into HEAD
|
||||
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
|
||||
+ parse-opt: fake short strings for callers to believe in.
|
||||
+ parse-opt: do not print errors on unknown options, return -2
|
||||
intead.
|
||||
+ parse-opt: create parse_options_step.
|
||||
+ parse-opt: Export a non NORETURN usage dumper.
|
||||
+ parse-opt: have parse_options_{start,end}.
|
||||
+ 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
|
||||
|
||||
Became active again ;-) This probably is ready for 'master' already,
|
||||
except for the last two which I only looked at the patch and have not
|
||||
used heavily in production yet.
|
||||
|
||||
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
|
||||
+ Make "subtree" part more orthogonal to the rest of merge-
|
||||
recursive.
|
||||
@ -134,23 +156,14 @@ messages available to other commands; status and branch are updated.
|
||||
+ git-merge-recursive-{ours,theirs}
|
||||
+ git-merge-file --ours, --theirs
|
||||
|
||||
Punting a merge by discarding your own work in conflicting parts but st=
|
||||
ill
|
||||
salvaging the parts that are cleanly automerged. It is likely that thi=
|
||||
s
|
||||
will result in nonsense mishmash, but somehow often people want this, s=
|
||||
o
|
||||
here they are. The interface to the backends is updated so that you ca=
|
||||
n
|
||||
say "git merge -Xours -Xsubtree=3Dfoo/bar/baz -s recursive other" now.
|
||||
|
||||
The -X<option> part may change, Dscho mentions that a single-letter -X
|
||||
that take stuck option is against syntax rules, and I think he's right.
|
||||
|
||||
This is more "because we can", not "because we need to".
|
||||
Punting a merge by discarding your own work in conflicting parts but still
|
||||
salvaging the parts that are cleanly automerged. It is likely that this
|
||||
will result in nonsense mishmash, but somehow often people want this, so
|
||||
here they are. The interface to the backends is updated so that you can
|
||||
say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
|
||||
|
||||
* mv/merge-in-c (Mon Jul 7 19:24:20 2008 +0200) 15 commits
|
||||
- Build in merge
|
||||
+ Build in merge
|
||||
+ Fix t7601-merge-pull-config.sh on AIX
|
||||
+ git-commit-tree: make it usable from other builtins
|
||||
+ Add new test case to ensure git-merge prepends the custom merge
|
||||
@ -172,32 +185,23 @@ This is more "because we can", not "because we need to".
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* js/import-zip (Mon Jun 30 19:50:44 2008 +0100) 1 commit
|
||||
+ Add another fast-import example, this time for .zip files
|
||||
* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits
|
||||
+ git-apply --directory: make --root more similar to GNU diff
|
||||
+ apply --root: thinkofix.
|
||||
+ Teach "git apply" to prepend a prefix with "--root=<root>"
|
||||
|
||||
* db/no-git-config (Mon Jun 30 03:37:47 2008 -0400) 1 commit
|
||||
+ Only use GIT_CONFIG in "git config", not other programs
|
||||
* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
|
||||
+ Make default expiration period of reflog used for stash infinite
|
||||
+ Per-ref reflog expiry configuration
|
||||
|
||||
* 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
|
||||
As 1.6.0 will be a good time to make backward incompatible changes, the
|
||||
tip commit makes the default expiry period of stash 'never', unless you
|
||||
configure them to expire explicitly using gc.refs/stash.* variables.
|
||||
Needs consensus, but I am guessing that enough people would want stash
|
||||
that does not expire.
|
||||
|
||||
* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
|
||||
+ rerere.autoupdate
|
||||
+ t4200: fix rerere test
|
||||
+ rerere: remove dubious "tail_optimization"
|
||||
+ git-rerere: detect unparsable conflicts
|
||||
+ rerere: rerere_created_at() and has_resolution() abstraction
|
||||
|
||||
A new configuration will allow paths that have been resolved cleanly by
|
||||
rerere to be updated in the index automatically.
|
||||
|
||||
* js/maint-daemon-syslog (Thu Jul 3 16:27:24 2008 +0100) 1 commit
|
||||
+ git daemon: avoid calling syslog() from a signal handler
|
||||
|
||||
Meant for 'maint' as well.
|
||||
* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
|
||||
+ Allow per-command pager config
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
@ -206,11 +210,9 @@ Meant for 'maint' as well.
|
||||
+ merge: remove deprecated summary and diffstat options and config
|
||||
variables
|
||||
|
||||
This was previously in "will be in master soon" category, but it turns =
|
||||
out
|
||||
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. Perha=
|
||||
ps
|
||||
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
|
||||
@ -225,41 +227,28 @@ timeframe.
|
||||
- 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
|
||||
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.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled/Needs more work]
|
||||
|
||||
* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
|
||||
. Migrate git-am to use git-sequencer
|
||||
. Add git-sequencer test suite (t3350)
|
||||
. Add git-sequencer prototype documentation
|
||||
. Add git-sequencer shell prototype
|
||||
|
||||
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
|
||||
- [BROKEN wrt shallow clones] Ignore graft during object transfer
|
||||
|
||||
Cloning or fetching from a repository from grafts did not send objects
|
||||
that are hidden by grafts, but the commits in the resulting repository =
|
||||
do
|
||||
that are hidden by grafts, but the commits in the resulting repository do
|
||||
need these to pass fsck. This fixes object transfer to ignore grafts.
|
||||
|
||||
Another fix is needed to git-prune so that it ignores grafts but treats
|
||||
commits that are mentioned in grafts as reachable.
|
||||
|
||||
* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
|
||||
- Migrate git-blame to parse-option partially.
|
||||
+ parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
|
||||
+ parse-opt: fake short strings for callers to believe in.
|
||||
+ parse-opt: do not print errors on unknown options, return -2
|
||||
intead.
|
||||
+ parse-opt: create parse_options_step.
|
||||
+ parse-opt: Export a non NORETURN usage dumper.
|
||||
+ parse-opt: have parse_options_{start,end}.
|
||||
|
||||
I recall Pierre said something about cleaning up the last one when he
|
||||
finds time, but other than that vague recollection, I lost track of thi=
|
||||
s
|
||||
series. I am tempted to fork a few topics off of the pen=C3=BAltimo on=
|
||||
e to
|
||||
convert a few more commands as examples and merge the result to 'next'.
|
||||
|
||||
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
|
||||
- blame: show "previous" information in --porcelain/--incremental
|
||||
format
|
||||
@ -270,16 +259,12 @@ convert a few more commands as examples and merge the result to 'next'.
|
||||
+ rev-list --children
|
||||
+ revision traversal: --children option
|
||||
|
||||
The blame that finds where each line in the original lines moved to. T=
|
||||
his
|
||||
may help a GSoC project that wants to gather statistical overview of th=
|
||||
e
|
||||
history. The final presentation may need tweaking (see the log message=
|
||||
of
|
||||
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 commit ""git-blame --reverse" on the series).
|
||||
|
||||
The tip two commits are for peeling to see what's behind the blamed
|
||||
commit, which we should be able to separate out into an independent top=
|
||||
ic
|
||||
commit, which we should be able to separate out into an independent topic
|
||||
from the rest.
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user