To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Nov 2012, #01; Sun, 4)
-X-master-at: f07e5551a845b45076bf5c45118e16efa69610c4
-X-next-at: 54991f2bb33a966609ff94ac4f8824bf9091ad7d
+Subject: What's cooking in git.git (Nov 2012, #02; Fri, 9)
+X-master-at: b0b00a3ee43b4813eb85728a482500f6422499fd
+X-next-at: 7a4c58c4d7b270e7e6bea673b5515cd0babe9508
-What's cooking in git.git (Nov 2012, #01; Sun, 4)
+What's cooking in git.git (Nov 2012, #02; Fri, 9)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
-The third batch of topics has graduated to master.
+The fourth batch of topics has graduated to master. This should be my
+last integration cycle, as Junio will be back to take over before the
+next one.
You can find the changes described here in the integration branches of
my repository at:
--------------------------------------------------
[New Topics]
-* as/maint-doc-fix-no-post-rewrite (2012-11-02) 1 commit
- - commit: fixup misplacement of --no-post-rewrite description
+* cr/push-force-tag-update (2012-11-09) 5 commits
+ - push: update remote tags only with force
+ - push: flag updates that require force
+ - push: flag updates
+ - push: add advice for rejected tag reference
+ - push: return reject reasons via a mask
- Will merge to 'next'.
+ Require "-f" for push to update a tag, even if it is a fast-forward.
+ Needs review.
-* fc/remote-bzr (2012-11-04) 3 commits
- - remote-bzr: add simple tests
- - remote-bzr: add support for pushing
- - Add new remote-bzr transport helper
+ I'm undecided yet on whether the goal is the right thing to do, but it
+ does prevent some potential mistakes. I haven't looked closely at the
+ implementation itself; review from interested parties would be helpful.
+
+
+* fc/fast-export-fixes (2012-11-08) 14 commits
+ - fast-export: don't handle uninteresting refs
+ - fast-export: make sure updated refs get updated
+ - fast-export: fix comparison in tests
+ - fast-export: trivial cleanup
+ - remote-testgit: make clear the 'done' feature
+ - remote-testgit: report success after an import
+ - remote-testgit: exercise more features
+ - remote-testgit: cleanup tests
+ - remote-testgit: remove irrelevant test
+ - remote-testgit: get rid of non-local functionality
+ - Add new simplified git-remote-testgit
+ - Rename git-remote-testgit to git-remote-testpy
+ - remote-testgit: fix direction of marks
+ - fast-export: avoid importing blob marks
+
+ Improvements to fix fast-export bugs, including how refs pointing to
+ already-seen commits are handled. An earlier 4-commit version of this
+ series looked good to me, but this much-expanded version has not seen
+ any comments.
- New remote helper for bzr.
+ Needs review.
-* fc/remote-hg (2012-11-04) 16 commits
- - remote-hg: the author email can be null
- - remote-hg: add option to not track branches
- - remote-hg: add extra author test
- - remote-hg: add tests to compare with hg-git
- - remote-hg: add bidirectional tests
- - test-lib: avoid full path to store test results
- - remote-hg: add basic tests
- - remote-hg: fake bookmark when there's none
- - remote-hg: add compat for hg-git author fixes
- - remote-hg: add support for hg-git compat mode
- - remote-hg: match hg merge behavior
- - remote-hg: make sure the encoding is correct
- - remote-hg: add support to push URLs
- - remote-hg: add support for remote pushing
- - remote-hg: add support for pushing
- - Add new remote-hg transport helper
-
- New remote helper for hg.
+* mg/maint-pull-suggest-upstream-to (2012-11-08) 1 commit
+ - push/pull: adjust missing upstream help text to changed interface
- May want to do one more round of review on the list.
+ Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid
+ suggesting the deprecated "--set-upstream".
- Most of the discussion so far has been on whether to pursue this versus
- what's in msysgit, and not on the specifics of the code. I'd like to
- put this in next soon, but it probably makes sense for everybody to
- give it a final look-over.
+ Will merge to 'next'.
-* jk/maint-http-half-auth-fetch (2012-10-31) 2 commits
- - remote-curl: retry failed requests for auth even with gzip
- - remote-curl: hoist gzip buffer size to top of post_rpc
+* mh/alt-odb-string-list-cleanup (2012-11-08) 2 commits
+ - link_alt_odb_entries(): take (char *, len) rather than two pointers
+ - link_alt_odb_entries(): use string_list_split_in_place()
- Fixes fetch from servers that ask for auth only during the actual
- packing phase. This is not really a recommended configuration, but it
- cleans up the code at the same time.
+ Cleanups in the alternates code. Fixes a potential bug and makes the
+ code much cleaner.
Will merge to 'next'.
-* js/hp-nonstop (2012-10-30) 1 commit
- - fix 'make test' for HP NonStop
+* pf/editor-ignore-sigint (2012-11-08) 1 commit
+ - launch_editor: ignore SIGINT while the editor has control
- Will merge to 'next'.
+ Avoid confusing cases where the user hits Ctrl-C while in the editor
+ session, not realizing git will receive the signal. Since most editors
+ will take over the terminal and will block SIGINT, this is not likely
+ to confuse anyone.
+ Comments welcome from people using unusual editors (e.g., a script that
+ starts an editor in another window then blocks, waiting for the user to
+ finish).
-* kb/preload-index-more (2012-11-02) 1 commit
- - update-index/diff-index: use core.preloadindex to improve performance
- Use preloadindex in more places, which has a nice speedup on systems
- with slow stat calls (and even on Linux).
+* pp/gitweb-config-underscore (2012-11-08) 1 commit
+ - gitweb: make remote_heads config setting work
- Will merge to 'next'.
+ The key "gitweb.remote_heads" is not legal git config; this maps it to
+ "gitweb.remoteheads".
+
+ Junio raised a good point about the implementation for three-level
+ variables.
+ Expecting a re-roll.
-* mh/notes-string-list (2012-11-04) 5 commits
- - string_list_add_refs_from_colon_sep(): use string_list_split()
- - notes: fix handling of colon-separated values
- - combine_notes_cat_sort_uniq(): sort and dedup lines all at once
- - Initialize sort_uniq_list using named constant
- - string_list: add a function string_list_remove_empty_items()
- Improve the asymptotic performance of the cat_sort_uniq notes merge
- strategy.
+* pw/maint-p4-rcs-expansion-newline (2012-11-08) 1 commit
+ - git p4: RCS expansion should not span newlines
+
+ I do not have p4 to play with, but looks obviously correct to me.
Will merge to 'next'.
-* mh/strbuf-split (2012-11-04) 4 commits
- - strbuf_split*(): document functions
- - strbuf_split*(): rename "delim" parameter to "terminator"
- - strbuf_split_buf(): simplify iteration
- - strbuf_split_buf(): use ALLOC_GROW()
+* rh/maint-gitweb-highlight-ext (2012-11-08) 1 commit
+ - gitweb.perl: fix %highlight_ext mappings
- Cleanups and documentation for strbuf_split.
+ Fixes a clever misuse of perl's list interpretation.
Will merge to 'next'.
-* mm/maint-doc-commit-edit (2012-11-02) 1 commit
- - Document 'git commit --no-edit' explicitly
+* rr/submodule-diff-config (2012-11-08) 3 commits
+ - submodule: display summary header in bold
+ - diff: introduce diff.submodule configuration variable
+ - Documentation: move diff.wordRegex from config.txt to diff-config.txt
- Will merge to 'next'.
+ Lets "git diff --submodule=log" become the default via configuration.
+
+ Seems like a good direction, though I had a few comments.
+
+ Expecting a re-roll.
--------------------------------------------------
[Graduated to "master"]
-* gb/maint-doc-svn-log-window-size (2012-10-26) 1 commit
- (merged to 'next' on 2012-10-29 at ee50b22)
- + Document git-svn fetch --log-window-size parameter
+* fc/completion-send-email-with-format-patch (2012-10-16) 1 commit
+ (merged to 'next' on 2012-11-04 at 0a6366e)
+ + completion: add format-patch options to send-email
- Will merge to 'master' in the third batch.
+ Will merge to 'master' in the fourth batch.
-* km/maint-doc-git-reset (2012-10-29) 1 commit
- (merged to 'next' on 2012-10-29 at cdb4e8f)
- + doc: git-reset: make "<mode>" optional
+* js/format-2047 (2012-10-18) 7 commits
+ (merged to 'next' on 2012-10-25 at 76d91fe)
+ + format-patch tests: check quoting/encoding in To: and Cc: headers
+ + format-patch: fix rfc2047 address encoding with respect to rfc822 specials
+ + format-patch: make rfc2047 encoding more strict
+ + format-patch: introduce helper function last_line_length()
+ + format-patch: do not wrap rfc2047 encoded headers too late
+ + format-patch: do not wrap non-rfc2047 headers too early
+ + utf8: fix off-by-one wrapping of text
- Will merge to 'master' in the third batch.
+ Fixes many rfc2047 quoting issues in the output from format-patch.
+ Will merge to 'master' in the fourth batch.
-* mm/maint-doc-remote-tracking (2012-10-25) 1 commit
- (merged to 'next' on 2012-10-25 at 80f1592)
- + Documentation: remote tracking branch -> remote-tracking branch
- We long ago hyphenated "remote-tracking branch"; this
- catches some new instances added since then.
+* km/send-email-compose-encoding (2012-10-25) 5 commits
+ (merged to 'next' on 2012-10-29 at d7d2bb4)
+ + git-send-email: add rfc2047 quoting for "=?"
+ + git-send-email: introduce quote_subject()
+ + git-send-email: skip RFC2047 quoting for ASCII subjects
+ + git-send-email: use compose-encoding for Subject
+ (merged to 'next' on 2012-10-25 at 5447367)
+ + git-send-email: introduce compose-encoding
+
+ "git send-email --compose" can let the user create a non-ascii
+ cover letter message, but there was not a way to mark it with
+ appropriate content type before sending it out.
- Will merge to 'master' in the third batch.
+ Further updates fix subject quoting.
+
+ Will merge to 'master' in the fourth batch.
-* ph/pull-rebase-detached (2012-10-25) 1 commit
- (merged to 'next' on 2012-10-25 at 73d9d14)
- + git-pull: Avoid merge-base on detached head
+* mh/maint-parse-dirstat-fix (2012-10-29) 1 commit
+ (merged to 'next' on 2012-11-04 at 852d609)
+ + parse_dirstat_params(): use string_list to split comma-separated string
+
+ Cleans up some code and avoids a potential bug.
+
+ Will merge to 'master' in the fourth batch.
+
+
+* mo/cvs-server-cleanup (2012-10-26) 11 commits
+ (merged to 'next' on 2012-10-29 at 4e70622)
+ + Use character class for sed expression instead of \s
+ (merged to 'next' on 2012-10-25 at c70881d)
+ + cvsserver status: provide real sticky info
+ + cvsserver: cvs add: do not expand directory arguments
+ + cvsserver: use whole CVS rev number in-process; don't strip "1." prefix
+ + cvsserver: split up long lines in req_{status,diff,log}
+ + cvsserver: clean up client request handler map comments
+ + cvsserver: remove unused functions _headrev and gethistory
+ + cvsserver update: comment about how we shouldn't remove a user-modified file
+ + cvsserver: add comments about database schema/usage
+ + cvsserver: removed unused sha1Or-k mode from kopts_from_path
+ + cvsserver t9400: add basic 'cvs log' test
+ (this branch is tangled with mo/cvs-server-updates.)
+
+ Cleanups to prepare for mo/cvs-server-updates.
- Avoids spewing error messages when using "pull --rebase" on a
- detached HEAD.
+ Will merge to 'master' in the fourth batch.
- Will merge to 'master' in the third batch.
+* nd/attr-match-optim-more (2012-10-15) 7 commits
+ (merged to 'next' on 2012-10-25 at 09f70ce)
+ + attr: more matching optimizations from .gitignore
+ + gitignore: make pattern parsing code a separate function
+ + exclude: split pathname matching code into a separate function
+ + exclude: fix a bug in prefix compare optimization
+ + exclude: split basename matching code into a separate function
+ + exclude: stricten a length check in EXC_FLAG_ENDSWITH case
+ + Merge commit 'f9f6e2c' into nd/attr-match-optim-more
+ (this branch is used by as/check-ignore and nd/wildmatch.)
-* po/maint-refs-replace-docs (2012-10-25) 1 commit
- (merged to 'next' on 2012-10-25 at 3874c9d)
- + Doc repository-layout: Show refs/replace
+ Start laying the foundation to build the "wildmatch" after we can
+ agree on its desired semantics.
- The refs/replace hierarchy was not mentioned in the
- repository-layout docs.
+ Will merge to 'master' in the fourth batch.
- Will merge to 'master' in the third batch.
+* nd/builtin-to-libgit (2012-10-29) 7 commits
+ (merged to 'next' on 2012-11-04 at 06cbf9b)
+ + fetch-pack: move core code to libgit.a
+ + fetch-pack: remove global (static) configuration variable "args"
+ + send-pack: move core code to libgit.a
+ + Move setup_diff_pager to libgit.a
+ + Move print_commit_list to libgit.a
+ + Move estimate_bisect_steps to libgit.a
+ + Move try_merge_command and checkout_fast_forward to libgit.a
-* pp/maint-doc-pager-config (2012-10-29) 1 commit
- (merged to 'next' on 2012-10-29 at 434fbd0)
- + Documentation: improve the example of overriding LESS via core.pager
+ Code cleanups so that libgit.a does not depend on anything in the
+ builtin/ directory.
- Will merge to 'master' in the third batch.
+ Some of the code movement is pretty big, but there doesn't seem to be
+ any conflicts with topics in flight.
+ Will merge to 'master' in the fourth batch.
-* rf/maint-mailmap-off-by-one (2012-10-28) 1 commit
- (merged to 'next' on 2012-10-29 at 8c2214b)
- + mailmap: avoid out-of-bounds memory access
- Will merge to 'master' in the third batch.
+* nd/tree-walk-enum-cleanup (2012-10-19) 1 commit
+ (merged to 'next' on 2012-11-04 at 8ccdf98)
+ + tree-walk: use enum interesting instead of integer
+ Will merge to 'master' in the fourth batch.
-* sl/maint-configure-messages (2012-10-25) 1 commit
- (merged to 'next' on 2012-10-25 at e1d7ecd)
- + configure: fix some output message
- Minor message fixes for the configure script.
+* ph/maint-submodule-status-fix (2012-10-29) 2 commits
+ (merged to 'next' on 2012-11-04 at d700e02)
+ + submodule status: remove unused orig_* variables
+ + t7407: Fix recursive submodule test
- Will merge to 'master' in the third batch.
+ Cleans up some leftover bits from an earlier submodule change.
+ Will merge to 'master' in the fourth batch.
-* sz/maint-submodule-reference-arg (2012-10-26) 1 commit
- (merged to 'next' on 2012-10-29 at 1aab03c)
- + submodule add: fix handling of --reference=<repo> option
- Will merge to 'master' in the third batch.
+* rs/lock-correct-ref-during-delete (2012-10-16) 1 commit
+ (merged to 'next' on 2012-10-25 at 9341eea)
+ + refs: lock symref that is to be deleted, not its target
+ When "update-ref -d --no-deref SYM" tried to delete a symbolic ref
+ SYM, it incorrectly locked the underlying reference pointed by SYM,
+ not the symbolic ref itself.
-* tb/maint-t9200-case-insensitive (2012-10-28) 1 commit
- (merged to 'next' on 2012-10-29 at 62af90c)
- + Fix t9200 on case insensitive file systems
+ Will merge to 'master' in the fourth batch.
- Will merge to 'master' in the third batch.
+* sz/maint-curl-multi-timeout (2012-10-19) 1 commit
+ (merged to 'next' on 2012-11-04 at f696dd8)
+ + Fix potential hang in https handshake
-* tj/maint-doc-commit-sign (2012-10-29) 1 commit
- (merged to 'next' on 2012-10-29 at 44c61a0)
- + Add -S, --gpg-sign option to manpage of "git commit"
+ Sometimes curl_multi_timeout() function suggested a wrong timeout
+ value when there is no file descriptors to wait on and the http
+ transport ended up sleeping for minutes in select(2) system call.
+ Detect this and reduce the wait timeout in such a case.
- Will merge to 'master' in the third batch.
+ Will merge to 'master' in the fourth batch.
--------------------------------------------------
[Stalled]
often attempt to use 'origin'. This can now be customized via a
configuration variable.
- Expecting a reroll.
+ Expecting a re-roll.
"The first remote becomes the default" bit is better done as a
separate step.
---------------------------------------------------
-[Cooking]
* mh/ceiling (2012-10-29) 8 commits
- string_list_longest_prefix(): remove function
pathname we obtain from getcwd(), leading the GIT_DIR discovery
logic to escape the ceilings the user thought to have specified.
- Need to look at v4 which made it to the list.
-
-
-* mo/cvs-server-cleanup (2012-10-26) 11 commits
- (merged to 'next' on 2012-10-29 at 4e70622)
- + Use character class for sed expression instead of \s
- (merged to 'next' on 2012-10-25 at c70881d)
- + cvsserver status: provide real sticky info
- + cvsserver: cvs add: do not expand directory arguments
- + cvsserver: use whole CVS rev number in-process; don't strip "1." prefix
- + cvsserver: split up long lines in req_{status,diff,log}
- + cvsserver: clean up client request handler map comments
- + cvsserver: remove unused functions _headrev and gethistory
- + cvsserver update: comment about how we shouldn't remove a user-modified file
- + cvsserver: add comments about database schema/usage
- + cvsserver: removed unused sha1Or-k mode from kopts_from_path
- + cvsserver t9400: add basic 'cvs log' test
- (this branch is tangled with mo/cvs-server-updates.)
-
- Cleanups to prepare for mo/cvs-server-updates.
-
- Will merge to 'master' in the fourth batch.
+--------------------------------------------------
+[Cooking]
-* mo/cvs-server-updates (2012-10-16) 20 commits
+* mo/cvs-server-updates (2012-10-16) 10 commits
- cvsserver Documentation: new cvs ... -r support
- cvsserver: add t9402 to test branch and tag refs
- cvsserver: support -r and sticky tags for most operations
- cvsserver: define a tag name character escape mechanism
- cvsserver: cleanup extra slashes in filename arguments
- cvsserver: factor out git-log parsing logic
- (merged to 'next' on 2012-10-25 at c70881d)
- + cvsserver status: provide real sticky info
- + cvsserver: cvs add: do not expand directory arguments
- + cvsserver: use whole CVS rev number in-process; don't strip "1." prefix
- + cvsserver: split up long lines in req_{status,diff,log}
- + cvsserver: clean up client request handler map comments
- + cvsserver: remove unused functions _headrev and gethistory
- + cvsserver update: comment about how we shouldn't remove a user-modified file
- + cvsserver: add comments about database schema/usage
- + cvsserver: removed unused sha1Or-k mode from kopts_from_path
- + cvsserver t9400: add basic 'cvs log' test
- (this branch is tangled with mo/cvs-server-cleanup.)
Needs review by folks interested in cvsserver.
- Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
- Split over-long synopsis in git-fetch-pack.txt into several lines
- Misapplication of a patch fixed; the ones near the tip needs to
- update the links to point at the html files, though.
-
- Needs follow-up on Junio's comment above.
+ Will merge to 'next'.
* lt/diff-stat-show-0-lines (2012-10-17) 1 commit
Now that Philip has submitted some documentation updates, this is
looking more ready.
- Will merge to master in the fifth batch.
-
-
-* sz/maint-curl-multi-timeout (2012-10-19) 1 commit
- (merged to 'next' on 2012-11-04 at f696dd8)
- + Fix potential hang in https handshake
-
- Sometimes curl_multi_timeout() function suggested a wrong timeout
- value when there is no file descriptors to wait on and the http
- transport ended up sleeping for minutes in select(2) system call.
- Detect this and reduce the wait timeout in such a case.
-
- Will merge to master in the fourth batch.
+ Will merge to 'master' in the fifth batch.
* jc/same-encoding (2012-11-04) 1 commit
equated them in some but not all codepaths. Introduce a new helper
function to make these codepaths consistent.
- will merge to master in the fourth batch.
-
-
-* nd/tree-walk-enum-cleanup (2012-10-19) 1 commit
- (merged to 'next' on 2012-11-04 at 8ccdf98)
- + tree-walk: use enum interesting instead of integer
-
- Will merge to master in the fourth batch.
+ Will merge to 'master' in the fifth batch.
* cr/cvsimport-local-zone (2012-11-04) 2 commits
Allows "cvsimport" to read per-author timezone from the author info
file.
- Will merge to master in the fifth batch.
-
-
-* fc/completion-send-email-with-format-patch (2012-10-16) 1 commit
- (merged to 'next' on 2012-11-04 at 0a6366e)
- + completion: add format-patch options to send-email
-
- Will merge to master in the fourth batch.
+ Will merge to 'master' in the fifth batch.
* fc/zsh-completion (2012-10-29) 3 commits
- completion: add new __gitcompadd helper
- completion: get rid of empty COMPREPLY assignments
- Needs comments from completion folks.
+ There were some comments on this, but I wasn't clear on the outcome.
+
+ Need to take a closer look.
* jc/apply-trailing-blank-removal (2012-10-12) 1 commit
they turn out to be directories?
-* rs/lock-correct-ref-during-delete (2012-10-16) 1 commit
- (merged to 'next' on 2012-10-25 at 9341eea)
- + refs: lock symref that is to be deleted, not its target
-
- When "update-ref -d --no-deref SYM" tried to delete a symbolic ref
- SYM, it incorrectly locked the underlying reference pointed by SYM,
- not the symbolic ref itself.
-
- Will merge to 'master' in the fourth batch.
-
-
-* as/check-ignore (2012-10-29) 13 commits
+* as/check-ignore (2012-11-08) 14 commits
+ - t0007: fix tests on Windows
- Documentation/check-ignore: we show the deciding match, not the first
- Add git-check-ignore sub-command
- dir.c: provide free_directory() for reclaiming dir_struct memory
- dir.c: rename excluded_from_list() to is_excluded_from_list()
- dir.c: rename path_excluded() to is_path_excluded()
- dir.c: rename cryptic 'which' variable to more consistent name
- (this branch uses nd/attr-match-optim-more; is tangled with nd/wildmatch.)
Duy helped to reroll this.
- Expecting another re-roll.
-
-
-* js/format-2047 (2012-10-18) 7 commits
- (merged to 'next' on 2012-10-25 at 76d91fe)
- + format-patch tests: check quoting/encoding in To: and Cc: headers
- + format-patch: fix rfc2047 address encoding with respect to rfc822 specials
- + format-patch: make rfc2047 encoding more strict
- + format-patch: introduce helper function last_line_length()
- + format-patch: do not wrap rfc2047 encoded headers too late
- + format-patch: do not wrap non-rfc2047 headers too early
- + utf8: fix off-by-one wrapping of text
-
- Fixes many rfc2047 quoting issues in the output from format-patch.
-
- Will merge to 'master' in the fourth batch.
-
-
-* km/send-email-compose-encoding (2012-10-25) 5 commits
- (merged to 'next' on 2012-10-29 at d7d2bb4)
- + git-send-email: add rfc2047 quoting for "=?"
- + git-send-email: introduce quote_subject()
- + git-send-email: skip RFC2047 quoting for ASCII subjects
- + git-send-email: use compose-encoding for Subject
- (merged to 'next' on 2012-10-25 at 5447367)
- + git-send-email: introduce compose-encoding
-
- "git send-email --compose" can let the user create a non-ascii
- cover letter message, but there was not a way to mark it with
- appropriate content type before sending it out.
-
- Further updates fix subject quoting.
-
- Will merge to 'master' in the fourth batch.
+ Expecting a re-roll.
* so/prompt-command (2012-10-17) 4 commits
instead of being used for command substitution in $PS1, to embed
color escape sequences in its output.
- Will 'cook' in next.
+ Will cook in 'next'.
* aw/rebase-am-failure-detection (2012-10-11) 1 commit
+ Import wildmatch from rsync
+ ctype: support iscntrl, ispunct, isxdigit and isprint
+ ctype: make sane_ctype[] const array
- (this branch uses nd/attr-match-optim-more; is tangled with as/check-ignore.)
Allows pathname patterns in .gitignore and .gitattributes files
with double-asterisks "foo/**/bar" to match any number of directory
"parents", etc.
-* nd/attr-match-optim-more (2012-10-15) 7 commits
- (merged to 'next' on 2012-10-25 at 09f70ce)
- + attr: more matching optimizations from .gitignore
- + gitignore: make pattern parsing code a separate function
- + exclude: split pathname matching code into a separate function
- + exclude: fix a bug in prefix compare optimization
- + exclude: split basename matching code into a separate function
- + exclude: stricten a length check in EXC_FLAG_ENDSWITH case
- + Merge commit 'f9f6e2c' into nd/attr-match-optim-more
- (this branch is used by as/check-ignore and nd/wildmatch.)
-
- Start laying the foundation to build the "wildmatch" after we can
- agree on its desired semantics.
-
- Will merge to 'master' in the fourth batch.
-
-
* nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits
. pretty: support %>> that steal trailing spaces
. pretty: support truncating in %>, %< and %><
This was split out from discarded jc/maint-push-refs-all topic.
- Will merge to master in the fifth batch.
+ Will merge to 'master' in the fifth batch.
* jh/symbolic-ref-d (2012-10-21) 1 commit
It is already possible to remove a symbolic ref with "update-ref -d
--no-deref", but it may be a good addition for completeness.
- Will merge to master in the fifth batch.
+ Will merge to 'master' in the fifth batch.
* jh/update-ref-d-through-symref (2012-10-21) 2 commits
Adds "--recursive" option to submodule sync.
- Will merge to master in the fifth batch.
+ Will merge to 'master' in the fifth batch.
* fc/completion-test-simplification (2012-10-29) 2 commits
Waiting for a sanity check and review from Junio.
-* mh/maint-parse-dirstat-fix (2012-10-29) 1 commit
- (merged to 'next' on 2012-11-04 at 852d609)
- + parse_dirstat_params(): use string_list to split comma-separated string
+* as/maint-doc-fix-no-post-rewrite (2012-11-02) 1 commit
+ (merged to 'next' on 2012-11-09 at 117a91e)
+ + commit: fixup misplacement of --no-post-rewrite description
- Cleans up some code and avoids a potential bug.
+ Will merge to 'master' in the fifth batch.
- Will merge master in the fourth batch.
+* fc/remote-bzr (2012-11-08) 5 commits
+ - remote-bzr: update working tree
+ - remote-bzr: add support for remote repositories
+ - remote-bzr: add support for pushing
+ - remote-bzr: add simple tests
+ - Add new remote-bzr transport helper
-* nd/builtin-to-libgit (2012-10-29) 7 commits
- (merged to 'next' on 2012-11-04 at 06cbf9b)
- + fetch-pack: move core code to libgit.a
- + fetch-pack: remove global (static) configuration variable "args"
- + send-pack: move core code to libgit.a
- + Move setup_diff_pager to libgit.a
- + Move print_commit_list to libgit.a
- + Move estimate_bisect_steps to libgit.a
- + Move try_merge_command and checkout_fast_forward to libgit.a
+ New remote helper for bzr.
- Code cleanups so that libgit.a does not depend on anything in the
- builtin/ directory.
+ Will merge to 'next'.
- Some of the code movement is pretty big, but there doesn't seem to be
- any conflicts with topics in flight.
- Will merge to master in the fourth batch.
+* fc/remote-hg (2012-11-04) 16 commits
+ - remote-hg: the author email can be null
+ - remote-hg: add option to not track branches
+ - remote-hg: add extra author test
+ - remote-hg: add tests to compare with hg-git
+ - remote-hg: add bidirectional tests
+ - test-lib: avoid full path to store test results
+ - remote-hg: add basic tests
+ - remote-hg: fake bookmark when there's none
+ - remote-hg: add compat for hg-git author fixes
+ - remote-hg: add support for hg-git compat mode
+ - remote-hg: match hg merge behavior
+ - remote-hg: make sure the encoding is correct
+ - remote-hg: add support to push URLs
+ - remote-hg: add support for remote pushing
+ - remote-hg: add support for pushing
+ - Add new remote-hg transport helper
+ New remote helper for hg.
-* ph/maint-submodule-status-fix (2012-10-29) 2 commits
- (merged to 'next' on 2012-11-04 at d700e02)
- + submodule status: remove unused orig_* variables
- + t7407: Fix recursive submodule test
+ Will merge to 'next'.
+
+
+* jk/maint-http-half-auth-fetch (2012-10-31) 2 commits
+ (merged to 'next' on 2012-11-09 at af69926)
+ + remote-curl: retry failed requests for auth even with gzip
+ + remote-curl: hoist gzip buffer size to top of post_rpc
+
+ Fixes fetch from servers that ask for auth only during the actual
+ packing phase. This is not really a recommended configuration, but it
+ cleans up the code at the same time.
+
+ Will merge to 'master' in the sixth batch.
+
+
+* js/hp-nonstop (2012-10-30) 1 commit
+ (merged to 'next' on 2012-11-09 at fe58205)
+ + fix 'make test' for HP NonStop
+
+ Will merge to 'master' in the fifth batch.
- Cleans up some leftover bits from an earlier submodule change.
- Will merge to master in the fourth batch.
+* kb/preload-index-more (2012-11-02) 1 commit
+ (merged to 'next' on 2012-11-09 at a750ebd)
+ + update-index/diff-index: use core.preloadindex to improve performance
+
+ Use preloadindex in more places, which has a nice speedup on systems
+ with slow stat calls (and even on Linux).
+
+ Will merge to 'master' in the sixth batch.
+
+
+* mh/notes-string-list (2012-11-08) 5 commits
+ (merged to 'next' on 2012-11-09 at 7a4c58c)
+ + string_list_add_refs_from_colon_sep(): use string_list_split()
+ + notes: fix handling of colon-separated values
+ + combine_notes_cat_sort_uniq(): sort and dedup lines all at once
+ + Initialize sort_uniq_list using named constant
+ + string_list: add a function string_list_remove_empty_items()
+
+ Improve the asymptotic performance of the cat_sort_uniq notes merge
+ strategy.
+
+ Will merge to 'master' in the fifth batch.
+* mh/strbuf-split (2012-11-04) 4 commits
+ (merged to 'next' on 2012-11-09 at fa984b1)
+ + strbuf_split*(): document functions
+ + strbuf_split*(): rename "delim" parameter to "terminator"
+ + strbuf_split_buf(): simplify iteration
+ + strbuf_split_buf(): use ALLOC_GROW()
+
+ Cleanups and documentation for strbuf_split.
+
+ Will merge to 'master' in the fifth batch.
+
+
+* mm/maint-doc-commit-edit (2012-11-02) 1 commit
+ (merged to 'next' on 2012-11-09 at 8dab7f5)
+ + Document 'git commit --no-edit' explicitly
+
+ Will merge to 'master' in the fifth batch.
+
projects / thirdparty / git.git / commitdiff
