kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

What's cooking (2010/05 #03)

todo
Junio C Hamano 2010-05-09 00:23:41 -07:00
parent a096a5edb3
commit 576287a197
1 changed files with 243 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

453
whats-cooking.txt
View File

@ -1,9 +1,9 @@
To: git@vger.kernel.org
Subject: What's cooking in git.git (May 2010, #02; Fri, 7)
X-master-at: cfb88e9a8d4926b0011ae2dd67e1f57a98f4b768
X-next-at: 703bdcf9e5ad91e669ce4c834d8d17a47c9e720e
Subject: What's cooking in git.git (May 2010, #03; Sun, 9)
X-master-at: 212f0ba357cde43d1cf66692f73a2f662d13ac55
X-next-at: 07419c952633f427ce186bf4c2b9a49592c9d3d3

What's cooking in git.git (May 2010, #02; Fri, 7)
What's cooking in git.git (May 2010, #03; Sun, 9)
--------------------------------------------------

Here are the topics that have been cooking. Commits prefixed with '-' are
@ -11,77 +11,173 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.

I'm in the middle of physically moving and haven't started graduating the
topics that have been cooking in 'next'. Perhaps I can find time to do so
for some of them over the weekend. I expect that I won't be back up to
speed until later this month.
Tonight's 'master' merges many topics that has been cooking for a few
weeks in 'next' as the first batch of 1.7.2 cycle. I will be moving some
topics in 'pu' to 'next' as the next step tomorrow. I'm in the middle of
moving and I expect that I won't be back up to speed until later this
month.

--------------------------------------------------
[New Topics]

* jn/gitweb-syntax-highlight (2010-04-27) 2 commits
- gitweb: Refactor syntax highlighting support
- gitweb: Syntax highlighting support
* jn/gitweb-fastcgi (2010-05-07) 5 commits
- gitweb: Add support for FastCGI, using CGI::Fast
- gitweb: Put all per-connection code in run() subroutine
- gitweb: Use nonlocal jump instead of 'exit' in die_error
- gitweb: href(..., -path_info => 0|1)
- Export more test-related variables when running external tests
(this branch shares commits with jn/gitweb-caching-prep.)

* jn/maint-amend-missing-name (2010-05-02) 1 commit
- commit --amend: cope with missing display name
* jn/make-header-dependency (2010-05-08) 2 commits
- Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
- Makefile: fix header dependency checker to allow NO_CURL builds

* rs/diff-no-minimal (2010-05-02) 1 commit
- git diff too slow for a file
* js/try-to-free-stackable (2010-05-08) 2 commits
- Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
- Have set_try_to_free_routine return the previous routine
(this branch uses np/malloc-threading.)

* ab/test-cleanup (2010-05-07) 2 commits
- Turn setup code in t2007-checkout-symlink.sh into a test
- Move t6000lib.sh to lib-*

* by/blame-doc-m-c (2010-05-06) 1 commit
- blame-options.txt: Add default value for `-M/-C` options.

* by/log-follow (2010-05-06) 3 commits
- Make git log --follow find copies among unmodified files.
- Make diffcore_std only can run once before a diff_flush
- Add a macro DIFF_QUEUE_CLEAR.

* eb/crlf (2010-05-07) 3 commits
- Add per-repository eol normalization
- Add tests for per-repository eol normalization
- Add "auto-eol" attribute and "core.eolStyle" config variable

* jn/notes-doc (2010-05-03) 4 commits
- Documentation/notes: nitpicks
- Documentation/notes: describe content of notes
- Documentation/notes: adjust description to use configuration section
- Documentation/notes: describe effect of environment and configuration

* mg/advice-statushints (2010-04-22) 2 commits
- wt-status: take advice.statusHints seriously
- t7508: test advice.statusHints
Should be Ok for 'next'.

--------------------------------------------------
[Graduated to "master"]

* jc/doc-submit-gmail (2010-04-07) 1 commit
(merged to 'next' on 2010-04-10 at cd4e8cf)
+ SubmittingPatches: update GMail section
* ab/commit-empty-message (2010-04-06) 1 commit
(merged to 'next' on 2010-05-04 at 54c2e47)
+ Add option to git-commit to allow empty log messages

* jg/auto-initialize-notes-with-percent-n-in-format (2010-04-13) 1 commit
+ pretty: Initialize notes if %N is used
(has been in 'next' since 2010-04-07)

* jk/maint-diffstat-overflow (2010-04-17) 1 commit
+ diff: use large integers for diffstat calculations
* bg/apply-blank-trailing-context (2010-04-08) 1 commit
(merged to 'next' on 2010-05-04 at 31f3482)
+ apply: Allow blank *trailing* context lines to match beyond EOF

* rr/remote-helper-doc (2010-04-07) 3 commits
+ Documentation/remote-helpers: Add invocation section
+ Documentation/urls: Rewrite to accomodate <transport>::<address>
+ Documentation/remote-helpers: Rewrite description
(has been in 'next' since 2010-04-14)

* wp/doc-filter-direction (2010-04-17) 1 commit
+ documentation: clarify direction of core.autocrlf
* bg/send-email-smtpdomain (2010-04-10) 4 commits
(merged to 'next' on 2010-05-04 at 2afbe2c)
+ send-email: Cleanup smtp-domain and add config
+ Document send-email --smtp-domain
+ send-email: Don't use FQDNs without a '.'
+ send-email: Cleanup { style

These were pushed out as part of 1.7.1
(has been in 'next' since 2010-04-14)

* cc/revert-strategy (2010-03-31) 5 commits
(merged to 'next' on 2010-05-04 at 6d44a83)
+ revert: add "--strategy" option to choose merge strategy
+ merge: make function try_merge_command non static
+ merge: refactor code that calls "git merge-STRATEGY"
+ revert: refactor merge recursive code into its own function
+ revert: use strbuf to refactor the code that writes the merge message

(has been in 'next' since 2010-04-05)

* cw/ws-indent-with-tab (2010-04-03) 6 commits
(merged to 'next' on 2010-05-04 at 1d7aca4)
+ whitespace: tests for git-apply --whitespace=fix with tab-in-indent
+ whitespace: add tab-in-indent support for --whitespace=fix
+ whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
+ whitespace: tests for git-diff --check with tab-in-indent error class
+ whitespace: add tab-in-indent error class
+ whitespace: we cannot "catch all errors known to git" anymore

(has been in 'next' since 2010-04-05)

* eb/unpretty-b-format (2010-03-24) 1 commit
(merged to 'next' on 2010-05-04 at a466ed8)
+ Add `%B' in format strings for raw commit body in `git log' and friends

(has been in 'next' since 2010-04-07)

* hg/maint-attr-fix (2010-04-06) 3 commits
(merged to 'next' on 2010-05-04 at 8b98845)
+ attr: Expand macros immediately when encountered.
+ attr: Allow multiple changes to an attribute on the same line.
+ attr: Fixed debug output for macro expansion.

(has been in 'next' since 2010-04-14)

* jc/maint-reflog-expire-unreachable (2010-04-07) 1 commit
(merged to 'next' on 2010-05-04 at 4efe837)
+ reflog --expire-unreachable: avoid merge-base computation
(this branch is used by jc/maint-no-reflog-expire-unreach-for-head.)

(has been in 'next' since 2010-04-22)

* jc/test-sleepless (2010-04-06) 1 commit
(merged to 'next' on 2010-05-04 at 9ff84b0)
+ war on "sleep" in tests

(has been in 'next' since 2010-04-07)

* jk/cached-textconv (2010-04-01) 5 commits
(merged to 'next' on 2010-05-04 at e4b72a0)
+ diff: avoid useless filespec population
+ diff: cache textconv output
+ textconv: refactor calls to run_textconv
+ introduce notes-cache interface
+ make commit_tree a library function

(has been in 'next' since 2010-04-02)

* mh/status-optionally-refresh (2010-04-03) 3 commits
(merged to 'next' on 2010-05-04 at be164f0)
+ t7508: add a test for "git status" in a read-only repository
+ git status: refresh the index if possible
+ t7508: add test for "git status" refreshing the index

(has been in 'next' since 2010-04-05)

* pc/remove-warn (2010-03-26) 4 commits
(merged to 'next' on 2010-05-04 at c79c1e6)
+ Remove a redundant errno test in a usage of remove_path
+ Introduce remove_or_warn function
+ Implement the rmdir_or_warn function
+ Generalise the unlink_or_warn function

(has been in 'next' since 2010-04-02)

* rc/ls-remote-default (2010-04-09) 1 commit
(merged to 'next' on 2010-05-04 at 2af33e1)
+ ls-remote: fall-back to default remotes when no remote specified

(has been in 'next' since 2010-04-14)

* rc/maint-curl-helper (2010-04-08) 3 commits
(merged to 'next' on 2010-05-04 at c32988d)
+ remote-curl: ensure that URLs have a trailing slash
+ http: make end_url_with_slash() public
+ t5541-http-push: add test for URLs with trailing slash

(has been in 'next' since 2010-04-14)

* sc/http-late-auth (2010-04-01) 1 commit
(merged to 'next' on 2010-05-04 at 23ae2e8)
+ Prompt for a username when an HTTP request 401s

(has been in 'next' since 2010-04-02)

* sd/log-decorate (2010-04-08) 6 commits
(merged to 'next' on 2010-05-04 at 6e54ae9)
+ log.decorate: only ignore it under "log --pretty=raw"
+ script with rev-list instead of log
+ log --pretty/--oneline: ignore log.decorate
+ log.decorate: usability fixes
+ Add `log.decorate' configuration variable.
+ git_config_maybe_bool()

(has been in 'next' since 2010-04-08)

--------------------------------------------------
[Stalled]

* jc/rev-list-ancestry-path (2010-04-20) 1 commit
- revision: --ancestry-path

Just an illustration patch. merge simplification logic used when
pathspecs are in effect interacts with this rather badly.

* js/rebase-origin-x (2010-02-05) 1 commit
- [RFC w/o test and incomplete] rebase: add -x option to record original commit name

@ -114,42 +210,90 @@ Good thing to do, but it came at a bad time.
--------------------------------------------------
[Cooking]

* jn/gitweb-syntax-highlight (2010-04-27) 2 commits
- gitweb: Refactor syntax highlighting support
- gitweb: Syntax highlighting support

* jn/maint-amend-missing-name (2010-05-02) 1 commit
- commit --amend: cope with missing display name

Should be Ok for 'next'.

* rs/diff-no-minimal (2010-05-02) 1 commit
- git diff too slow for a file

Should be Ok for 'next'.

* ab/test-cleanup (2010-05-07) 2 commits
- Turn setup code in t2007-checkout-symlink.sh into a test
- Move t6000lib.sh to lib-*

Should be Ok for 'next'.

* by/blame-doc-m-c (2010-05-06) 1 commit
- blame-options.txt: Add default value for `-M/-C` options.

* by/log-follow (2010-05-06) 3 commits
- Make git log --follow find copies among unmodified files.
- Make diffcore_std only can run once before a diff_flush
- Add a macro DIFF_QUEUE_CLEAR.

Should be Ok for 'next'.

* eb/crlf (2010-05-08) 4 commits
- Add per-repository eol normalization
- Pass eol conv mode as an argument instead of using global auto_crlf
- Add tests for per-repository eol normalization
- Add "core.eolStyle" variable to control end-of-line conversion

* jn/notes-doc (2010-05-08) 8 commits
- Documentation/notes: nitpicks
- Documentation/notes: clean up description of rewriting configuration
- Documentation/notes: simplify treatment of default display refs
- Documentation/log: add a CONFIGURATION section
- Documentation/notes: simplify treatment of default notes ref
- Documentation/notes: add configuration section
- Documentation/notes: describe content of notes blobs
- Documentation/notes: document format of notes trees

* mg/advice-statushints (2010-04-22) 2 commits
- wt-status: take advice.statusHints seriously
- t7508: test advice.statusHints

Should be Ok for 'next'.

* cb/maint-stash-orphaned-file (2010-04-18) 2 commits
(merged to 'next' on 2010-05-04 at 38488ba)
+ stash tests: stash can lose data in a file removed from the index
+ stash: Don't overwrite files that have gone from the index

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* jn/maint-bundle (2010-04-19) 2 commits
(merged to 'next' on 2010-05-04 at f2086f5)
+ fix "bundle --stdin" segfault
+ t5704 (bundle): add tests for bundle --stdin

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* pb/patch-id-plus (2010-04-19) 2 commits
(merged to 'next' on 2010-05-04 at 59881b8)
+ patch-id: Add support for mbox format
+ patch-id: extract parsing one diff out of generate_id_list

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* rr/doc-submitting (2010-04-19) 1 commit
(merged to 'next' on 2010-05-04 at 5f040bd)
+ SubmittingPatches: Add new section about what to base work on

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* st/remote-tags-no-tags (2010-04-20) 2 commits
- remote add: add a --[no-]tags option
- Honor "tagopt = --tags" configuration option

* jc/rev-list-ancestry-path (2010-04-20) 1 commit
- revision: --ancestry-path

Just an illustration patch. merge simplification logic used when
pathspecs are in effect interacts with this rather badly.
Should be Ok for 'next'.

* cb/assume-unchanged-fix (2010-05-01) 2 commits
- Documentation: git-add does not update files marked "assume unchanged"
@ -161,20 +305,29 @@ pathspecs are in effect interacts with this rather badly.
There also was a companion patch to fast-import to deal with foreign SCM
interface that may not have human-readable author identifier.

Should be Ok for 'next'.

* jn/gitweb-caching-prep (2010-04-24) 5 commits
- gitweb: Move generating page title to separate subroutine
- gitweb: Add custom error handler using die_error
- gitweb: Use nonlocal jump instead of 'exit' in die_error
- gitweb: href(..., -path_info => 0|1)
- Export more test-related variables when running external tests
(this branch shares commits with jn/gitweb-fastcgi.)

Should be Ok for 'next'.

* jn/gitweb-install (2010-05-01) 2 commits
- gitweb: Create install target for gitweb in Makefile
- gitweb: Improve installation instructions in gitweb/INSTALL

Should be Ok for 'next'.

* jn/gitweb-our-squelch (2010-04-30) 1 commit
- gitweb: Silence 'Variable VAR may be unavailable' warnings

Should be Ok for 'next'.

* jn/maint-request-pull (2010-05-07) 3 commits
- t5150: protect backslash with backslash in shell
- request-pull: protect against OPTIONS_KEEPDASHDASH from environment
@ -186,6 +339,8 @@ interface that may not have human-readable author identifier.
- Merge branch 'jn/maint-request-pull' into jn/request-pull
(this branch uses jn/maint-request-pull.)

Should be Ok for 'next'.

* jn/shortlog (2010-05-03) 5 commits
- pretty: Respect --abbrev option
- shortlog: Document and test --format option
@ -193,16 +348,21 @@ interface that may not have human-readable author identifier.
- t4201 (shortlog): guard setup with test_expect_success
- Documentation/shortlog: scripted users should not rely on implicit HEAD

* wp/pretty-enhancement (2010-05-02) 3 commits
Should be Ok for 'next'.

* wp/pretty-enhancement (2010-05-08) 4 commits
- pretty: initialize new cmt_fmt_map to 0
- pretty: add aliases for pretty formats
- pretty: add infrastructure for commit format aliases
- pretty: make it easier to add new formats

Should be Ok for 'next'.

* jn/t7006-fixup (2010-04-14) 1 commit
(merged to 'next' on 2010-05-04 at 490ab5d)
+ t7006: guard cleanup with test_expect_success

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* js/maint-receive-pack-symref-alias (2010-04-19) 3 commits
(merged to 'next' on 2010-05-04 at 259f4f1)
@ -210,7 +370,7 @@ interface that may not have human-readable author identifier.
+ receive-pack: detect aliased updates which can occur with symrefs
+ receive-pack: switch global variable 'commands' to a parameter

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* sp/maint-dumb-http-pack-reidx (2010-04-19) 12 commits
(merged to 'next' on 2010-05-04 at 166443a)
@ -227,7 +387,7 @@ interface that may not have human-readable author identifier.
+ t5550-http-fetch: Use subshell for repository operations
+ http.c: Remove bad free of static block

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* hg/id-munging (2010-04-06) 2 commits
- convert: Keep foreign $Id$ on checkout.
@ -239,7 +399,7 @@ interface that may not have human-readable author identifier.
+ t7400: clarify 'submodule add' tests
+ t7400: split setup into multiple tests

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* np/index-pack-memsave (2010-04-12) 3 commits
(merged to 'next' on 2010-05-04 at 366b014)
@ -247,35 +407,34 @@ interface that may not have human-readable author identifier.
+ index-pack: rationalize unpack_entry_data()
+ index-pack: smarter memory usage when resolving deltas

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* jc/am-3-show-corrupted-patch (2010-04-09) 1 commit
(merged to 'next' on 2010-05-04 at 951f0e6)
+ am -3: recover the diagnostic messages for corrupt patches

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* jc/maint-no-reflog-expire-unreach-for-head (2010-04-09) 3 commits
(merged to 'next' on 2010-05-04 at d23a180)
+ reflog --expire-unreachable: special case entries in "HEAD" reflog
+ more war on "sleep" in tests
+ Document gc.<pattern>.reflogexpire variables
(this branch uses jc/maint-reflog-expire-unreachable.)

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* cw/maint-exec-defpath (2010-04-15) 2 commits
(merged to 'next' on 2010-05-04 at 8d1591f)
+ autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
+ exec_cmd.c: replace hard-coded path list with one from <paths.h>

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)

* tr/word-diff (2010-04-14) 1 commit
(merged to 'next' on 2010-05-04 at d191b25)
+ diff: add --word-diff option that generalizes --color-words

(was in 'next' on 2010-04-22)
(has been in 'next' since 2010-04-22)
There are gitk patches that go with this series.

* sp/maint-describe-tiebreak-with-tagger-date (2010-04-12) 5 commits
@ -286,44 +445,7 @@ There are gitk patches that go with this series.
+ tag.h: Remove unused signature field
+ tag.c: Correct indentation

(was in 'next' on 2010-04-22)

* bg/apply-blank-trailing-context (2010-04-08) 1 commit
(merged to 'next' on 2010-05-04 at 31f3482)
+ apply: Allow blank *trailing* context lines to match beyond EOF

(was in 'next' on 2010-04-14)

* bg/send-email-smtpdomain (2010-04-10) 4 commits
(merged to 'next' on 2010-05-04 at 2afbe2c)
+ send-email: Cleanup smtp-domain and add config
+ Document send-email --smtp-domain
+ send-email: Don't use FQDNs without a '.'
+ send-email: Cleanup { style

(was in 'next' on 2010-04-14)

* rc/ls-remote-default (2010-04-09) 1 commit
(merged to 'next' on 2010-05-04 at 2af33e1)
+ ls-remote: fall-back to default remotes when no remote specified

(was in 'next' on 2010-04-14)

* rc/maint-curl-helper (2010-04-08) 3 commits
(merged to 'next' on 2010-05-04 at c32988d)
+ remote-curl: ensure that URLs have a trailing slash
+ http: make end_url_with_slash() public
+ t5541-http-push: add test for URLs with trailing slash

(was in 'next' on 2010-04-14)

* hg/maint-attr-fix (2010-04-06) 3 commits
(merged to 'next' on 2010-05-04 at 8b98845)
+ attr: Expand macros immediately when encountered.
+ attr: Allow multiple changes to an attribute on the same line.
+ attr: Fixed debug output for macro expansion.

(was in 'next' on 2010-04-14)
(has been in 'next' since 2010-04-22)

* jc/status-show-ignored (2010-05-01) 6 commits
(merged to 'next' on 2010-05-04 at 8b32120)
@ -334,42 +456,18 @@ There are gitk patches that go with this series.
+ wt-status: plug memory leak while collecting untracked files
+ wt-status: remove unused workdir_untracked member

(was in 'next' on 2010-05-01)
(has been in 'next' since 2010-05-01)

I am negative about conflating the JSON output to the mix at this point.
Let's stabilize "status" with the existing --porcelain/-z option first.

* eb/unpretty-b-format (2010-03-24) 1 commit
(merged to 'next' on 2010-05-04 at a466ed8)
+ Add `%B' in format strings for raw commit body in `git log' and friends

(was in 'next' on 2010-04-07)

* ab/commit-empty-message (2010-04-06) 1 commit
(merged to 'next' on 2010-05-04 at 54c2e47)
+ Add option to git-commit to allow empty log messages

(was in 'next' on 2010-04-07)

* jc/test-sleepless (2010-04-06) 1 commit
(merged to 'next' on 2010-05-04 at 9ff84b0)
+ war on "sleep" in tests

(was in 'next' on 2010-04-07)

* jc/maint-reflog-expire-unreachable (2010-04-07) 1 commit
(merged to 'next' on 2010-05-04 at 4efe837)
+ reflog --expire-unreachable: avoid merge-base computation
(this branch is used by jc/maint-no-reflog-expire-unreach-for-head.)

(was in 'next' on 2010-04-22)

* np/malloc-threading (2010-04-08) 2 commits
(merged to 'next' on 2010-05-04 at 1b0567f)
+ Thread-safe xmalloc and xrealloc needs a recursive mutex
+ Make xmalloc and xrealloc thread-safe
(this branch is used by js/try-to-free-stackable.)

(was in 'next' on 2010-04-10)
(has been in 'next' since 2010-04-10)

The fix should eventually go to 'maint' and 'master'.

@ -383,37 +481,7 @@ The fix should eventually go to 'maint' and 'master'.
+ Make report() from usage.c public as vreportf() and use it.
+ Modernize t5530-upload-pack-error.

(all except for the tip was in 'next' on 2010-03-20).

* sd/log-decorate (2010-04-08) 6 commits
(merged to 'next' on 2010-05-04 at 6e54ae9)
+ log.decorate: only ignore it under "log --pretty=raw"
+ script with rev-list instead of log
+ log --pretty/--oneline: ignore log.decorate
+ log.decorate: usability fixes
+ Add `log.decorate' configuration variable.
+ git_config_maybe_bool()

(was in 'next' on 2010-04-08)

* mh/status-optionally-refresh (2010-04-03) 3 commits
(merged to 'next' on 2010-05-04 at be164f0)
+ t7508: add a test for "git status" in a read-only repository
+ git status: refresh the index if possible
+ t7508: add test for "git status" refreshing the index

(was in 'next' on 2010-04-05)

* cw/ws-indent-with-tab (2010-04-03) 6 commits
(merged to 'next' on 2010-05-04 at 1d7aca4)
+ whitespace: tests for git-apply --whitespace=fix with tab-in-indent
+ whitespace: add tab-in-indent support for --whitespace=fix
+ whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst
+ whitespace: tests for git-diff --check with tab-in-indent error class
+ whitespace: add tab-in-indent error class
+ whitespace: we cannot "catch all errors known to git" anymore

(was in 'next' on 2010-04-05)
(all except for the tip has been in 'next' since 2010-03-20).

* sr/remote-helper-export (2010-04-12) 9 commits
(merged to 'next' on 2010-05-04 at 519ab16)
@ -428,33 +496,7 @@ The fix should eventually go to 'maint' and 'master'.
+ clone: pass the remote name to remote_get
(this branch is used by jp/hold-string-list-sanity.)

(was in 'next' on 2010-04-12)

* cc/revert-strategy (2010-03-31) 5 commits
(merged to 'next' on 2010-05-04 at 6d44a83)
+ revert: add "--strategy" option to choose merge strategy
+ merge: make function try_merge_command non static
+ merge: refactor code that calls "git merge-STRATEGY"
+ revert: refactor merge recursive code into its own function
+ revert: use strbuf to refactor the code that writes the merge message

(was in 'next' on 2010-04-05)

* sc/http-late-auth (2010-04-01) 1 commit
(merged to 'next' on 2010-05-04 at 23ae2e8)
+ Prompt for a username when an HTTP request 401s

(was in 'next' on 2010-04-02)

* jk/cached-textconv (2010-04-01) 5 commits
(merged to 'next' on 2010-05-04 at e4b72a0)
+ diff: avoid useless filespec population
+ diff: cache textconv output
+ textconv: refactor calls to run_textconv
+ introduce notes-cache interface
+ make commit_tree a library function

(was in 'next' on 2010-04-02)
(has been in 'next' since 2010-04-12)

* ld/discovery-limit-to-fs (2010-04-04) 6 commits
- write-index: check and warn when worktree crosses a filesystem boundary
@ -465,24 +507,15 @@ The fix should eventually go to 'maint' and 'master'.
+ truncate cwd string before printing error message
+ config.c: remove static keyword from git_env_bool()

(all except for the tip was in 'next' on 2010-04-07)
(all except for the tip has been in 'next' since 2010-04-07)

The tip one is a bit iffy.

* pc/remove-warn (2010-03-26) 4 commits
(merged to 'next' on 2010-05-04 at c79c1e6)
+ Remove a redundant errno test in a usage of remove_path
+ Introduce remove_or_warn function
+ Implement the rmdir_or_warn function
+ Generalise the unlink_or_warn function

(was in 'next' on 2010-04-02)

* em/checkout-orphan (2010-03-21) 1 commit
(merged to 'next' on 2010-05-04 at ddb45fc)
+ git checkout: create unparented branch by --orphan

(was in 'next' on 2010-03-28)
(has been in 'next' since 2010-03-28)

Perhaps needs a bit of documentation updates, describing the "going open
source" scenario.
@ -492,4 +525,4 @@ source" scenario.
+ Use strbufs instead of open-coded string manipulation
+ Allow passing of configuration parameters in the command line

(was in 'next' on 2010-04-07)
(has been in 'next' since 2010-04-07)