@ -1,8 +1,8 @@
@@ -1,8 +1,8 @@
Subject: What's cooking in git.git (Sep 2008, #03; Fri, 19)
X-master-at: 3791f77c28f233df121da2f83abf7eefc7b49b69
X-next-at: 724951a306cebd5ce76602b9a0394df74ce52174
Subject: What's cooking in git.git (Sep 2008, #04; Mon, 22)
X-master-at: c76dc9592d1c770212d50ee7a7028a74f472f23b
X-next-at: 7f0eb98a28d41e28f6a7b72e118d72de01bab1a7
What's cooking in git.git (Sep 2008, #03; Fri, 19)
What's cooking in git.git (Sep 2008, #04; Mon, 22)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed
@ -12,109 +12,40 @@ in 'next'.
@@ -12,109 +12,40 @@ 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 ;-).
I'll be on vacation til Oct 08; proposal/review/discussion/improvement
cycle based on e-mails and the distributed nature of git mean that it
shouldn't keep the participants from further improving the system. I've
asked Shawn to look after in-flight patches during the time, so hopefully
when I come back I'll see a much better git ;-).
----------------------------------------------------------------
[New Topics]
* mg/maint-remote-fix (Thu Sep 18 18:11:02 2008 +0200) 1 commit
- make "git remote" report multiple URLs
* nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits
- grep: skip files that have not been checked out
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
- Prevent diff machinery from examining worktree outside narrow
checkout
- Add tests for updating no-checkout entries in index
- ls-files: add --narrow-checkout option to "will checkout" entries
- update-index: add --checkout/--no-checkout to update
CE_NO_CHECKOUT bit
- update-index: refactor mark_valid() in preparation for new options
- Introduce CE_NO_CHECKOUT bit
- Extend index to save more flags
This is an early half of the earlier series (I haven't had chance to look
at the updated series yet), and should be replaced with the updated one
posted recently.
Still with a minor nit but I think this is an improvement.
----------------------------------------------------------------
[Stalled -- Needs Action to Proceed (or to be dropped)]
* 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
* dp/maint-rebase-fix (Tue Sep 9 16:05:26 2008 +0400) 2 commits
+ git-rebase--interactive: auto amend only edited commit
+ git-rebase-interactive: do not squash commits on abort
* jc/maint-checkout-keep-remove (Sun Sep 7 19:49:25 2008 -0700) 1 commit
+ checkout: do not lose staged removal
* 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
* 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
+ sha1write: don't copy full sized buffers
+ Merge branch 'np/maint-safer-pack' into np/pack
* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit
+ for-each-ref: `:short` format for `refname`
* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits
+ add '%d' pretty format specifier to show decoration
+ move load_ref_decorations() to log-tree.c and export it
+ log: add load_ref_decorations()
* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits
+ t6013: replace use of 'tac' with equivalent Perl
+ rev-list: fix --reverse interaction with --parents
* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits
+ bisect: remove "checkout_done" variable used when checking merge
bases
+ bisect: only check merge bases when needed
+ bisect: test merge base if good rev is not an ancestor of bad rev
* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit
+ daemon.c: avoid setlinebuf()
* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits
+ 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
----------------------------------------------------------------
[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
@ -131,7 +62,7 @@ I think this is still buggy and drops the option when am stops with
@@ -131,7 +62,7 @@ I think this is still buggy and drops the option when am stops with
conflicts.
----------------------------------------------------------------
[Will be merged to "master" soon]
[Will be merged to 'master/maint' soon]
* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
+ builtin-merge: release the lockfile in try_merge_strategy()
@ -147,27 +78,36 @@ conflicts.
@@ -147,27 +78,36 @@ conflicts.
+ merge-recursive.c: Add more generic merge_recursive_generic()
+ Split out merge_recursive() to merge-recursive.c
(Tip at 4271666)
* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
+ diff --dirstat-by-file: count changed files, not lines
(Tip at fd33777)
* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
+ safe_create_leading_directories(): make it about "leading"
directories
(Tip at 5f0bdf5)
* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
+ git-apply:--include=pathspec
(Tip at 6ecb1ee)
* 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
(Tip at 7a172b0)
* 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
(Tip at 746c221)
* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
+ Fix AsciiDoc errors in merge documentation
@ -190,6 +130,8 @@ conflicts.
@@ -190,6 +130,8 @@ conflicts.
+ checkout -f: allow ignoring unmerged paths when checking out of
the index
(Tip at 3407a7a)
* 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
@ -197,13 +139,75 @@ conflicts.
@@ -197,13 +139,75 @@ conflicts.
+ receive-pack: make it a builtin
+ is_directory(): a generic helper function
----------------------------------------------------------------
[Actively Cooking]
(Tip at d79796b)
* bc/master-diff-hunk-header-fix (Sat Sep 20 18:36:22 2008 -0700) 10 commits
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
hunk-header-fix
+ diff hunk pattern: fix misconverted "\{" tex macro introducers
+ diff: fix "multiple regexp" semantics to find hunk header comment
+ diff: use extended regexp to find hunk headers
+ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
hunk-header-fix
+ diff: use extended regexp to find hunk headers
+ 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
(Tip at 92bb978)
* 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
(Tip at 4d6e4c4)
I think the above are all ready for 'master'.
* mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit
+ make "git remote" report multiple URLs
(Tip at 7d20e21)
* bc/maint-diff-hunk-header-fix (Sat Sep 20 15:30:12 2008 -0700) 5 commits
+ diff hunk pattern: fix misconverted "\{" tex macro introducers
+ diff: use extended regexp to find hunk headers
+ 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
(Tip at 96d1a8e)
The above two are ready for 'maint'.
----------------------------------------------------------------
[Actively Cooking]
* 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
My impression from the last round of discusson on the third patch in this
series (not queued here) was that as long as we do not present it as "One
True Workflow", the description was a good starting point, possibly others
to add other recommended flows later.
* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
+ builtin-commit.c: show on which branch a commit was added
Tentatively kicked back to "still cooking" status after Jeff voiced his
annoyance. I personally do not like making this multi-line as Jeff
suggested as an alternative (the message already is too verbose to my
taste).
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
+ date/time: do not get confused by fractional seconds
Junio C Hamano
17 years ago