What's cooking (2008/09 #03)
Junio C Hamano
parent
7a06f968d5
commit
8d7157da24
|
|
@ -1,8 +1,8 @@
|
|||
Subject: What's cooking in git.git (Sep 2008, #02; Wed, 10)
|
||||
X-master-at: ede4caf6e3204f9d63758d6410d0f124b0caab32
|
||||
X-next-at: c8d31b67b3f0e13f6b8ad782dadc6e8a8bc06bbb
|
||||
Subject: What's cooking in git.git (Sep 2008, #03; Fri, 19)
|
||||
X-master-at: 3791f77c28f233df121da2f83abf7eefc7b49b69
|
||||
X-next-at: 724951a306cebd5ce76602b9a0394df74ce52174
|
||||
|
||||
What's cooking in git.git (Sep 2008, #02; Wed, 10)
|
||||
What's cooking in git.git (Sep 2008, #03; Fri, 19)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
|
|
@ -12,11 +12,55 @@ 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.
|
||||
|
||||
By the way, I'll be on vacation from Sep 24 til Oct 08, but e-mail based
|
||||
proposal/review/discussion/improvement cycle and the distributed nature of
|
||||
git mean that it shouldn't keep the participants from further working on
|
||||
the system. Hopefully when I come back I'll see a much improved git ;-).
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
Many 'maint' material to go through the usual 'next' to 'master' to
|
||||
'maint' cycle..
|
||||
* mg/maint-remote-fix (Thu Sep 18 18:11:02 2008 +0200) 1 commit
|
||||
- make "git remote" report multiple URLs
|
||||
|
||||
Still with a minor nit but I think this is an improvement.
|
||||
|
||||
* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
|
||||
- t7400: Add short "git submodule add" testsuite
|
||||
|
||||
Waiting for a reroll.
|
||||
|
||||
* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
|
||||
+ Documentation: Refer to git-rebase(1) to warn against rewriting
|
||||
+ Documentation: new upstream rebase recovery section in git-rebase
|
||||
|
||||
I think the last one on "recommended practice" needs discussion. I do not
|
||||
think it describes _the_ recommended workflow, although I think (1) what
|
||||
is recommended in the draft does make sense within its own scope, and (2)
|
||||
it may be impossible to come up with _the_ recommended workflow anyway.
|
||||
|
||||
* bc/maint-diff-hunk-header-fix (Thu Sep 18 17:44:33 2008 -0500) 3 commits
|
||||
+ diff.*.xfuncname which uses "extended" regex's for hunk header
|
||||
selection
|
||||
+ diff.c: associate a flag with each pattern and use it for
|
||||
compiling regex
|
||||
+ diff.c: return pattern entry pointer rather than just the hunk
|
||||
header pattern
|
||||
|
||||
* bc/master-diff-hunk-header-fix (Thu Sep 18 20:32:50 2008 -0700) 4 commits
|
||||
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
|
||||
hunk-header-fix
|
||||
+ diff.*.xfuncname which uses "extended" regex's for hunk header
|
||||
selection
|
||||
+ diff.c: associate a flag with each pattern and use it for
|
||||
compiling regex
|
||||
+ diff.c: return pattern entry pointer rather than just the hunk
|
||||
header pattern
|
||||
|
||||
I've commented on these two branches in a separate message.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mh/maint-honor-no-ssl-verify (Thu Feb 21 15:10:37 2008 -0800) 1 commit
|
||||
+ Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
|
||||
|
|
@ -31,81 +75,6 @@ Many 'maint' material to go through the usual 'next' to 'master' to
|
|||
* jc/maint-template-permbits (Thu Aug 21 19:31:50 2008 -0500) 1 commit
|
||||
+ Fix permission bits on sources checked out with an overtight umask
|
||||
|
||||
* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
|
||||
- wt-status: Teach how to discard changes in the working directory
|
||||
- wt-status: Split header generation into three functions
|
||||
|
||||
This is what I commented as "making status output even chattier", but
|
||||
parked here to see what people think.
|
||||
|
||||
* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
|
||||
- t7603: add new testcases to ensure builtin-commit uses
|
||||
reduce_heads()
|
||||
- builtin-commit: use commit_tree()
|
||||
- commit_tree(): add a new author parameter
|
||||
|
||||
* pb/autocorrect-wrapper (Wed Sep 10 14:44:20 2008 -0700) 2 commits
|
||||
- Fixup -- waiting for response
|
||||
- git wrapper: also uses aliases to suggest mistyped commands
|
||||
|
||||
* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
|
||||
- push: receiver end advertises refs from alternate repositories
|
||||
- push: prepare sender to receive extended ref information from the
|
||||
receiver
|
||||
- receive-pack: make it a builtin
|
||||
- is_directory(): a generic helper function
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit
|
||||
+ diff: Help "less" hide ^M from the output
|
||||
|
||||
* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit
|
||||
+ checkout: do not check out unmerged higher stages randomly
|
||||
|
||||
This is the same one as the bottom of "better conflict resolution" series.
|
||||
|
||||
* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
|
||||
+ configure: auto detect dynamic library path switches
|
||||
+ Makefile: Allow CC_LD_DYNPATH to be overriden
|
||||
|
||||
I decided to push this forward; it might break minority configurations,
|
||||
but it appears nobody pays attention until it actually hurts, so let's see
|
||||
what happens when this hits 'master'.
|
||||
|
||||
* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits
|
||||
+ Add help.autocorrect to enable/disable autocorrecting
|
||||
+ git wrapper: DWIM mistyped commands
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had good comments on how the callback should be structured.
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
- git-am: Pass the --directory option through to git-apply
|
||||
|
||||
I think this is still buggy and drops the option when am stops with
|
||||
conflicts.
|
||||
|
||||
* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
|
||||
- Teach git.el to mark/unmark files by regexp
|
||||
- git.el: Diff only file at point by default
|
||||
|
||||
These are still queued but Alexandre had improvement requests so these
|
||||
will likely be dropped.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to "master" soon]
|
||||
|
||||
* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits
|
||||
+ t5300: improve SHA1 collision test
|
||||
+ pack-objects: don't include missing preferred base objects
|
||||
|
|
@ -137,8 +106,46 @@ will likely be dropped.
|
|||
+ diff --quiet: make it synonym to --exit-code >/dev/null
|
||||
+ diff Porcelain: do not disable auto index refreshing on -C -C
|
||||
|
||||
* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
|
||||
+ discard_cache: reset lazy name_hash bit
|
||||
|
||||
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
|
||||
+ diff: vary default prefix depending on what are compared
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
[Stalled -- Needs Action to Proceed (or to be dropped)]
|
||||
|
||||
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
|
||||
- Use xdiff caching to improve git blame performance
|
||||
- Allow xdiff machinery to cache hash results for a file
|
||||
- Always initialize xpparam_t to 0
|
||||
- Bypass textual patch generation and parsing in git blame
|
||||
- Allow alternate "low-level" emit function from xdl_diff
|
||||
|
||||
Réne had good comments on how the callback should be structured.
|
||||
|
||||
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
|
||||
- git-am: Pass the --directory option through to git-apply
|
||||
|
||||
I think this is still buggy and drops the option when am stops with
|
||||
conflicts.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will be merged to "master" soon]
|
||||
|
||||
* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
|
||||
+ builtin-merge: release the lockfile in try_merge_strategy()
|
||||
+ merge-recursive: get rid of virtual_id
|
||||
+ merge-recursive: move current_{file,directory}_set to struct
|
||||
merge_options
|
||||
+ merge-recursive: move the global obuf to struct merge_options
|
||||
+ merge-recursive: get rid of the index_only global variable
|
||||
+ merge-recursive: move call_depth to struct merge_options
|
||||
+ cherry-pick/revert: make direct internal call to merge_tree()
|
||||
+ builtin-merge: avoid run_command_v_opt() for recursive and subtree
|
||||
+ merge-recursive: introduce merge_options
|
||||
+ merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
+ Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
|
||||
+ diff --dirstat-by-file: count changed files, not lines
|
||||
|
|
@ -148,7 +155,16 @@ will likely be dropped.
|
|||
directories
|
||||
|
||||
* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
|
||||
- git-apply:--include=pathspec
|
||||
+ git-apply:--include=pathspec
|
||||
|
||||
* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
|
||||
+ t7603: add new testcases to ensure builtin-commit uses
|
||||
reduce_heads()
|
||||
+ builtin-commit: use commit_tree()
|
||||
+ commit_tree(): add a new author parameter
|
||||
|
||||
* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit
|
||||
+ git wrapper: also use aliases to correct mistyped commands
|
||||
|
||||
* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
|
||||
+ builtin-commit.c: show on which branch a commit was added
|
||||
|
|
@ -174,45 +190,29 @@ will likely be dropped.
|
|||
+ checkout -f: allow ignoring unmerged paths when checking out of
|
||||
the index
|
||||
|
||||
* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
|
||||
+ push: receiver end advertises refs from alternate repositories
|
||||
+ push: prepare sender to receive extended ref information from the
|
||||
receiver
|
||||
+ receive-pack: make it a builtin
|
||||
+ is_directory(): a generic helper function
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
|
||||
+ wt-status: Teach how to discard changes in the working directory
|
||||
+ wt-status: Split header generation into three functions
|
||||
|
||||
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
|
||||
+ date/time: do not get confused by fractional seconds
|
||||
|
||||
* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
|
||||
+ discard_cache: reset lazy name_hash bit
|
||||
|
||||
I spotted this by accident while working on something unrelated.
|
||||
|
||||
When a program calls discard_cache() to read the index again, we do not
|
||||
properly re-initialize the name_hash structure that is used by the case
|
||||
insensitivitly logic. This _might_ improve issues people may be having on
|
||||
case insensitive filesystems. I dunno.
|
||||
|
||||
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
|
||||
+ git-add --intent-to-add (-N)
|
||||
|
||||
Teaches "git add" to record only the intent to add a path later.
|
||||
I rerolled this without the fake empty blob object.
|
||||
|
||||
* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
|
||||
+ builtin-merge: release the lockfile in try_merge_strategy()
|
||||
+ merge-recursive: get rid of virtual_id
|
||||
+ merge-recursive: move current_{file,directory}_set to struct
|
||||
merge_options
|
||||
+ merge-recursive: move the global obuf to struct merge_options
|
||||
+ merge-recursive: get rid of the index_only global variable
|
||||
+ merge-recursive: move call_depth to struct merge_options
|
||||
+ cherry-pick/revert: make direct internal call to merge_tree()
|
||||
+ builtin-merge: avoid run_command_v_opt() for recursive and subtree
|
||||
+ merge-recursive: introduce merge_options
|
||||
+ merge-recursive.c: Add more generic merge_recursive_generic()
|
||||
+ Split out merge_recursive() to merge-recursive.c
|
||||
|
||||
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
|
||||
+ diff: vary default prefix depending on what are compared
|
||||
|
||||
As some people may have noticed, I've been running with this one when
|
||||
sending out "How about this" patches to the discussion threads.
|
||||
|
||||
* 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue