To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Jun 2014, #03; Tue, 10)
-X-master-at: 50f84e34a1b0bb893327043cb0c491e02ced9ff5
-X-next-at: 8cd8cf873f2edce97930416c82a1a2213d488ee4
+Subject: What's cooking in git.git (Jun 2014, #04; Tue, 17)
+X-master-at: cb682f8cfe63ecd0da08a526f404d295e51e3ab1
+X-next-at: f681aa8b2164b7263bd68f49cd3bebd6bf560b78
-What's cooking in git.git (Jun 2014, #03; Tue, 10)
+What's cooking in git.git (Jun 2014, #04; Tue, 17)
--------------------------------------------------
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 tip of 'next' has been rewound. I originally wanted to eject
-many younger topics and slim the branch down, but decided against
-it.
+Many topics that have been cooking in 'next' during the previous
+cycle, totalling close to 300 individual patches, are in 'master'
+now. We have also accumulated some fixes we need to merge down to
+'maint' and cut a v2.0.1 sometime next week.
You can find the changes described here in the integration branches
of the repositories listed at
--------------------------------------------------
[Graduated to "master"]
-* jc/rev-parse-argh-dashed-multi-words (2014-06-04) 1 commit
- (merged to 'next' on 2014-06-06 at 8b04440)
- + update-index: fix segfault with missing --cacheinfo argument
+* mt/patch-id-stable (2014-06-10) 1 commit
+ - patch-id: change default to stable
- "update-index --cacheinfo" in 2.0 crashes on a malformed command line.
+ Teaches "git patch-id" to compute the patch ID that does not change
+ when the files in a single patch is reordered. As this new algorithm
+ is backward incompatible, the last bit to flip it to be the default
+ is left out of 'master' for now.
-* jc/shortlog-ref-exclude (2014-06-04) 1 commit
- (merged to 'next' on 2014-06-06 at a358cbe)
- + shortlog: allow --exclude=<glob> to be passed
+* as/pretty-truncate (2014-05-21) 5 commits
+ (merged to 'next' on 2014-06-10 at d8147a2)
+ + pretty.c: format string with truncate respects logOutputEncoding
+ + t4205, t6006: add tests that fail with i18n.logOutputEncoding set
+ + t4205 (log-pretty-format): use `tformat` rather than `format`
+ + t4041, t4205, t6006, t7102: don't hardcode tested encoding value
+ + t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
- "shortlog --opts and args" and "log --opts and args | shortlog"
- should be equivalent, but the former did not grok some options.
+ Originally merged to 'next' on 2014-05-23
-* lt/request-pull (2014-06-02) 1 commit
- (merged to 'next' on 2014-06-06 at ad4d79d)
- + fix brown paper bag breakage in t5150-request-pull.sh
+* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits
+ (merged to 'next' on 2014-06-10 at eddb5bc)
+ + transport-helper.c: rearrange xcalloc arguments
+ + remote.c: rearrange xcalloc arguments
+ + reflog-walk.c: rearrange xcalloc arguments
+ + pack-revindex.c: rearrange xcalloc arguments
+ + notes.c: rearrange xcalloc arguments
+ + imap-send.c: rearrange xcalloc arguments
+ + http-push.c: rearrange xcalloc arguments
+ + diff.c: rearrange xcalloc arguments
+ + config.c: rearrange xcalloc arguments
+ + commit.c: rearrange xcalloc arguments
+ + builtin/remote.c: rearrange xcalloc arguments
+ + builtin/ls-remote.c: rearrange xcalloc arguments
+ Originally merged to 'next' on 2014-06-06
-* mn/sideband-no-ansi (2014-06-02) 1 commit
- (merged to 'next' on 2014-06-06 at f61fc73)
- + sideband.c: do not use ANSI control sequence on non-terminal
+ Like calloc(3), xcalloc() takes nmemb and then size.
-* na/no-http-test-in-the-middle (2014-05-30) 1 commit
- (merged to 'next' on 2014-06-06 at e195615)
- + t5538: move http push tests out to t5542
+* cb/byte-order (2014-05-30) 3 commits
+ (merged to 'next' on 2014-06-10 at 63db8ee)
+ + compat/bswap.h: fix endianness detection
+ + compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
+ + compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
+ Originally merged to 'next' on 2014-05-30
-* pb/trim-trailing-spaces (2014-06-02) 1 commit
- (merged to 'next' on 2014-06-06 at 741efc2)
- + dir.c:trim_trailing_spaces(): fix for " \ " sequence
+ Compatibility enhancement for Solaris.
- Fix an error in parsing of .gitignore files that use a trailing
- "\ " to mark pathnames that end with a SP.
+* cc/replace-edit (2014-05-19) 10 commits
+ (merged to 'next' on 2014-06-10 at ff69722)
+ + Documentation: replace: describe new --edit option
+ + replace: add --edit to usage string
+ + replace: add tests for --edit
+ + replace: die early if replace ref already exists
+ + replace: refactor checking ref validity
+ + replace: make sure --edit results in a different object
+ + replace: add --edit option
+ + replace: factor object resolution out of replace_object
+ + replace: use OPT_CMDMODE to handle modes
+ + replace: refactor command-mode determination
+ (this branch is used by cc/replace-graft.)
-* rs/mailinfo-header-cmp (2014-06-02) 1 commit
- (merged to 'next' on 2014-06-06 at 5e856f4)
- + mailinfo: use strcmp() for string comparison
+ Originally merged to 'next' on 2014-05-19
- Avoid running over the end of header string while parsing an
- incoming e-mail message to extract the patch.
+ "git replace" learns a new "--edit" option.
---------------------------------------------------
-[New Topics]
-* ep/avoid-test-a-o (2014-06-10) 21 commits
- - git-submodule.sh: avoid "echo" path-like values
- - SQUASH: misconversion breakage fix
- - git-submodule.sh: avoid "test <cond> -a/-o <cond>"
- - t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
- - t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
- - t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
- - t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
- - t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
- - t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
- - t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
- - t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
- - t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
- - git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
- - git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
- - git-bisect.sh: avoid "test <cond> -a/-o <cond>"
- - contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
- - contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
- - contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
- - contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
- - contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
- - check_bindir: avoid "test <cond> -a/-o <cond>"
+* dt/refs-check-refname-component-optim (2014-06-05) 1 commit
+ (merged to 'next' on 2014-06-10 at 4560669)
+ + refs.c: optimize check_refname_component()
+ (this branch is used by dt/refs-check-refname-component-sse42.)
+ Originally merged to 'next' on 2014-06-06
-* jc/revision-dash-count-parsing (2014-06-09) 1 commit
- (merged to 'next' on 2014-06-10 at 1aeca19)
- + revision: parse "git log -<count>" more carefully
- "git log -2master" is a common typo that shows two commits starting
- from whichever random branch that is not 'master' that happens to
- be checked out currently.
+* fc/remote-helper-refmap (2014-04-21) 8 commits
+ (merged to 'next' on 2014-06-10 at 8cd8cf8)
+ + transport-helper: remove unnecessary strbuf resets
+ + transport-helper: add support to delete branches
+ + fast-export: add support to delete refs
+ + fast-import: add support to delete refs
+ + transport-helper: add support to push symbolic refs
+ + transport-helper: add support for old:new refspec
+ + fast-export: add new --refspec option
+ + fast-export: improve argument parsing
- Will merge to 'master'.
+ Originally merged to 'next' on 2014-04-22
+ Allow remote-helper/fast-import based transport to rename the refs
+ while transferring the history.
-* jc/test-lazy-prereq (2014-06-09) 7 commits
- - tests: drop GIT_*_TIMING_TESTS environment variable support
- (merged to 'next' on 2014-06-10 at 4f774f7)
- + t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
- + t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
- + t3302: do not chdir around in the primary test process
- + t3302: coding style updates
- + test: turn USR_BIN_TIME into a lazy prerequisite
- + test: turn EXPENSIVE into a lazy prerequisite
- Test-script clean-up. The last step might be controversial.
+* ib/test-selectively-run (2014-06-06) 4 commits
+ (merged to 'next' on 2014-06-10 at 1235570)
+ + t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
+ + test-lib: '--run' to run only specific tests
+ + test-lib: tests skipped by GIT_SKIP_TESTS say so
+ + test-lib: document short options in t/README
- Will merge to 'master' except for the last one.
+ Originally merged to 'next' on 2014-06-06
+ Allow specifying only certain individual test pieces to be run
+ using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
-* jk/commit-buffer-length (2014-06-10) 16 commits
- - SQUASH to 12/15???
- - commit: record buffer length in cache
- - commit: convert commit->buffer to a slab
- - commit-slab: provide a static initializer
- - use get_commit_buffer everywhere
- - convert logmsg_reencode to get_commit_buffer
- - use get_commit_buffer to avoid duplicate code
- - use get_cached_commit_buffer where appropriate
- - provide helpers to access the commit buffer
- - provide a helper to set the commit buffer
- - provide a helper to free commit buffer
- - sequencer: use logmsg_reencode in get_message
- - logmsg_reencode: return const buffer
- - do not create "struct commit" with xcalloc
- - commit: push commit_index update into alloc_commit_node
- - alloc: include any-object allocations in alloc_report
- Expecting a reroll.
+* jk/argv-array-for-child-process (2014-05-15) 7 commits
+ (merged to 'next' on 2014-06-10 at 07a167b)
+ + argv-array: drop "detach" code
+ + get_importer: use run-command's internal argv_array
+ + get_exporter: use argv_array
+ + get_helper: use run-command's internal argv_array
+ + git_connect: use argv_array
+ + run_column_filter: use argv_array
+ + run-command: store an optional argv_array
+ Originally merged to 'next' on 2014-05-21
-* jm/api-strbuf-doc (2014-06-09) 1 commit
- (merged to 'next' on 2014-06-10 at 831aa30)
- + api-strbuf.txt minor typos
- Will merge to 'master'.
+* jk/complete-merge-pull (2014-05-27) 2 commits
+ (merged to 'next' on 2014-06-10 at d1524c5)
+ + completion: add missing options for git-merge
+ + completion: add a note that merge options are shared
+ Originally merged to 'next' on 2014-06-06
-* rs/more-starts-with (2014-06-09) 1 commit
- (merged to 'next' on 2014-06-10 at efcd02e)
- + Use starts_with() for C strings instead of memcmp()
+ The completion code did not know about quite a few options that are
+ common between "git merge" and "git pull", and a couple of options
+ unique to "git merge".
- Will merge to 'master'.
+* jk/daemon-tolower (2014-05-23) 1 commit
+ (merged to 'next' on 2014-06-10 at f3c549d)
+ + daemon/config: factor out duplicate xstrdup_tolower
-* sk/mingw-dirent (2014-06-09) 5 commits
- - Win32 dirent: improve dirent implementation
- - Win32 dirent: clarify #include directives
- - Win32 dirent: change FILENAME_MAX to MAX_PATH
- - Win32 dirent: remove unused dirent.d_reclen member
- - Win32 dirent: remove unused dirent.d_ino member
+ Originally merged to 'next' on 2014-05-23
-* sk/mingw-main (2014-06-10) 2 commits
- - mingw: avoid const warning
- - Win32: move main macro to a function
- (this branch is used by sk/mingw-uni-console; uses sk/windows-unc-path.)
+* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
+ (merged to 'next' on 2014-06-10 at 984862b)
+ + run_diff_files: do not look at uninitialized stat data
+ Originally merged to 'next' on 2014-05-21
-* sk/mingw-uni-console (2014-06-10) 6 commits
- - Win32: fix broken pipe detection
- - Win32: Thread-safe windows console output
- - Win32: add Unicode conversion functions
- - Win32: warn if the console font doesn't support Unicode
- - Win32: detect console streams more reliably
- - Win32: support Unicode console output
- (this branch uses sk/mingw-main and sk/windows-unc-path.)
- Could somebody from the mingw land double check that I queued the
- right versions for the above three, as there were many iterations
- and I wasn't paying attention.
+* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
+ (merged to 'next' on 2014-06-10 at 0cd28d7)
+ + move "--follow needs one pathspec" rule to diff_setup_done
- After that will merge to 'next' and to 'master'.
+ Originally merged to 'next' on 2014-05-23
-* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit
- (merged to 'next' on 2014-06-10 at 374082c)
- + t5551: fix the 50,000 tag test
+* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
+ (merged to 'next' on 2014-06-10 at 745b05c)
+ + t/lib-httpd: require SANITY prereq
- Will merge to 'master'.
+ Originally merged to 'next' on 2014-05-21
-* jk/repack-pack-keep-objects (2014-06-10) 3 commits
- - repack: s/write_bitmap/&s/ in code
- - repack: respect pack.writebitmaps
- - repack: do not accidentally pack kept objects by default
- (this branch is used by jk/repack-pack-writebitmaps-config.)
+* jk/error-resolve-conflict-advice (2014-06-03) 2 commits
+ (merged to 'next' on 2014-06-10 at 713ebe0)
+ + error_resolve_conflict: drop quotations around operation
+ + error_resolve_conflict: rewrap advice message
- Will merge to 'next'.
+ Originally merged to 'next' on 2014-06-06
-* jk/repack-pack-writebitmaps-config (2014-06-10) 3 commits
- - repack: introduce repack.writeBitmaps config option
- - repack: simplify handling of --write-bitmap-index
- - pack-objects: stop respecting pack.writebitmaps
- (this branch uses jk/repack-pack-keep-objects.)
+* jk/http-errors (2014-05-27) 8 commits
+ (merged to 'next' on 2014-06-10 at 30e9212)
+ + http: default text charset to iso-8859-1
+ + remote-curl: reencode http error messages
+ + strbuf: add strbuf_reencode helper
+ + http: optionally extract charset parameter from content-type
+ + http: extract type/subtype portion of content-type
+ + t5550: test display of remote http error messages
+ + t/lib-httpd: use write_script to copy CGI scripts
+ + test-lib: preserve GIT_CURL_VERBOSE from the environment
- Will merge to 'next'.
+ Originally merged to 'next' on 2014-06-06
+ Propagate the error messages from the webserver better to the
+ client coming over the HTTP transport.
-* mg/verify-commit (2014-06-10) 3 commits
- - verify-commit: scriptable commit signature verification
- - gpg-interface: provide access to the payload
- - pretty: free the gpg status buf
- Will merge to 'next'.
+* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
+ (merged to 'next' on 2014-06-10 at 299ea28)
+ + open_sha1_file: report "most interesting" errno
+ Originally merged to 'next' on 2014-05-21
-* nd/init-restore-env (2014-06-10) 1 commit
- - git potty: restore environments after alias expansion
- Will merge to 'next'.
+* jk/strbuf-tolower (2014-05-23) 1 commit
+ (merged to 'next' on 2014-06-10 at 01e6983)
+ + strbuf: add strbuf_tolower function
---------------------------------------------------
-[Stalled]
+ Originally merged to 'next' on 2014-05-23
-* nd/split-index (2014-06-02) 34 commits
- - fixup! read-cache: new API write_locked_index instead of write_index/write_cache
- - SQUASH???
- - t1700: new tests for split-index mode
- - t2104: make sure split index mode is off for the version test
- - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
- - read-tree: note about dropping split-index mode or index version
- - read-tree: force split-index mode off on --index-output
- - rev-parse: add --shared-index-path to get shared index path
- - update-index --split-index: do not split if $GIT_DIR is read only
- - update-index: new options to enable/disable split index mode
- - split-index: strip pathname of on-disk replaced entries
- - split-index: do not invalidate cache-tree at read time
- - split-index: the reading part
- - split-index: the writing part
- - read-cache: mark updated entries for split index
- - read-cache: save deleted entries in split index
- - read-cache: mark new entries for split index
- - read-cache: split-index mode
- - read-cache: save index SHA-1 after reading
- - entry.c: update cache_changed if refresh_cache is set in checkout_entry()
- - cache-tree: mark istate->cache_changed on prime_cache_tree()
- - cache-tree: mark istate->cache_changed on cache tree update
- - cache-tree: mark istate->cache_changed on cache tree invalidation
- - unpack-trees: be specific what part of the index has changed
- - resolve-undo: be specific what part of the index has changed
- - update-index: be specific what part of the index has changed
- - read-cache: be specific what part of the index has changed
- - read-cache: be strict about "changed" in remove_marked_cache_entries()
- - read-cache: store in-memory flags in the first 12 bits of ce_flags
- - read-cache: relocate and unexport commit_locked_index()
- - read-cache: new API write_locked_index instead of write_index/write_cache
- - sequencer: do not update/refresh index if the lock cannot be held
- - ewah: delete unused ewah_read_mmap_native declaration
- - ewah: fix constness of ewah_read_mmap
- The tip two remind us the need for a minor reroll. If I find time
- I could try to squash them myself, but it is low priority for me.
+* jl/remote-rm-prune (2014-05-27) 3 commits
+ (merged to 'next' on 2014-06-10 at 13259ff)
+ + remote prune: optimize "dangling symref" check/warning
+ + remote: repack packed-refs once when deleting multiple refs
+ + remote rm: delete remote configuration as the last
+
+ Originally merged to 'next' on 2014-06-06
+
+ "git remote rm" and "git remote prune" can involve removing many
+ refs at once, which is not a very efficient thing to do when very
+ many refs exist in the packed-refs file.
+
+
+* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
+ (merged to 'next' on 2014-06-10 at fc63847)
+ + commit -m: commit staged submodules regardless of ignore config
+ + status/commit: show staged submodules regardless of ignore config
+
+ Originally merged to 'next' on 2014-06-06
+
+ submodule.*.ignore and diff.ignoresubmodules are used to ignore all
+ submodule changes in "diff" output, but it can be confusing to
+ apply these configuration values to status and commit.
+
+ This is a backward-incompatible change, but should be so in a good
+ way (aka bugfix).
+
+
+* jm/dedup-test-config (2014-06-05) 1 commit
+ (merged to 'next' on 2014-06-10 at 8966f54)
+ + t/t7810-grep.sh: remove duplicate test_config()
+
+ Originally merged to 'next' on 2014-06-06
+
+
+* jm/doc-wording-tweaks (2014-05-28) 1 commit
+ (merged to 'next' on 2014-06-10 at 5f2e094)
+ + Documentation: wording fixes in the user manual and glossary
+
+ Originally merged to 'next' on 2014-06-06
+
+
+* jm/format-patch-mail-sig (2014-05-27) 2 commits
+ (merged to 'next' on 2014-06-10 at 310f59e)
+ + format-patch: add "--signature-file=<file>" option
+ + format-patch: make newline after signature conditional
+
+ Originally merged to 'next' on 2014-06-06
+
+
+* jm/instaweb-apache-24 (2014-05-27) 1 commit
+ (merged to 'next' on 2014-06-10 at ecf2048)
+ + git-instaweb: add support for Apache 2.4
+
+ Originally merged to 'next' on 2014-06-06
+
+
+* jm/t9138-style-fix (2014-05-27) 1 commit
+ (merged to 'next' on 2014-06-10 at 034f13d)
+ + t9138-git-svn-authors-prog.sh fixups
+
+ Originally merged to 'next' on 2014-06-06
+
+
+* lt/log-auto-decorate (2014-05-30) 1 commit
+ (merged to 'next' on 2014-06-10 at f149f4a)
+ + git log: support "auto" decorations
+
+ Originally merged to 'next' on 2014-06-06
+
+
+* nd/daemonize-gc (2014-05-27) 1 commit
+ (merged to 'next' on 2014-06-10 at 6fae7b0)
+ + gc --auto: do not lock refs in the background
+
+ Originally merged to 'next' on 2014-06-06
+
+ "git gc --auto" was recently changed to run in the background to
+ give control back early to the end-user sitting in front of the
+ terminal, but it forgot that housekeeping involving reflogs should
+ be done without other processes competing for accesses to the refs.
+
+
+* ow/config-mailmap-pathname (2014-05-27) 1 commit
+ (merged to 'next' on 2014-06-10 at aba4ca2)
+ + config: respect '~' and '~user' in mailmap.file
+
+ Originally merged to 'next' on 2014-06-06
+
+ mailmap.file configuration names a pathname, hence should honor
+ ~/path and ~user/path as its value.
+
+
+* rr/rebase-autostash-fix (2014-05-20) 2 commits
+ (merged to 'next' on 2014-06-10 at afd0c29)
+ + rebase -i: test "Nothing to do" case with autostash
+ + rebase -i: handle "Nothing to do" case with autostash
+
+ Originally merged to 'next' on 2014-05-21
+
+
+* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit
+ (merged to 'next' on 2014-06-10 at abae695)
+ + pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
+
+ Originally merged to 'next' on 2014-06-06
+
+ Avoid unnecessary copy of previous contents when extending the
+ hashtable used in pack-objects.
+
+
+* rs/read-ref-at (2014-06-03) 1 commit
+ (merged to 'next' on 2014-06-10 at f58f2fc)
+ + refs.c: change read_ref_at to use the reflog iterators
+
+ Originally merged to 'next' on 2014-06-06
+
+
+* sh/enable-preloadindex (2014-06-03) 1 commit
+ (merged to 'next' on 2014-06-10 at 7cedf2d)
+ + environment.c: enable core.preloadindex by default
+
+ Originally merged to 'next' on 2014-06-06
+
+
+* sk/test-cmp-bin (2014-06-04) 1 commit
+ (merged to 'next' on 2014-06-10 at 020a475)
+ + t5000, t5003: do not use test_cmp to compare binary files
+
+ Originally merged to 'next' on 2014-06-06
+
+
+* sk/wincred (2014-05-14) 2 commits
+ (merged to 'next' on 2014-06-10 at 8d03e5a)
+ + wincred: avoid overwriting configured variables
+ + wincred: add install target
+
+ Originally merged to 'next' on 2014-05-21
+
+
+* sk/windows-unc-path (2014-06-10) 1 commit
+ (merged to 'next' on 2014-06-10 at 3598cc6)
+ + Windows: allow using UNC path for git repository
+ (this branch is used by sk/mingw-main, sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
+
+ Originally merged to 'next' on 2014-05-21
+
+
+* ta/string-list-init (2014-06-06) 1 commit
+ (merged to 'next' on 2014-06-10 at bf209ff)
+ + string-list: spell all values out that are given to a string_list initializer
+
+ Originally merged to 'next' on 2014-06-06
+
+--------------------------------------------------
+[New Topics]
+
+* fr/sequencer-fail-with-not-one-upon-no-ff (2014-06-09) 1 commit
+ (merged to 'next' on 2014-06-16 at 29734cc)
+ + sequencer: signal failed ff as an aborted, not a conflicted merge
+
+ Will merge to 'master'.
+
+
+* hv/submodule-config (2014-06-13) 6 commits
+ - SQUASH compilation fix
+ - do not die on error of parsing fetchrecursesubmodules option
+ - use new config API for worktree configurations of submodules
+ - extract functions for submodule config set and lookup
+ - implement submodule config cache for lookup of submodule names
+ - hashmap: add enum for hashmap free_entries option
+
+
+* mc/git-p4-prepare-p4-only (2014-06-13) 1 commit
+ (merged to 'next' on 2014-06-16 at 3c05e19)
+ + git-p4: fix submit in non --prepare-p4-only mode
+
+ Will merge to 'master'.
+
+
+* sk/mingw-unicode-spawn-args (2014-06-16) 6 commits
+ - Win32: Unicode arguments (incoming)
+ - Win32: Unicode arguments (outgoing)
+ - MinGW: disable CRT command line globbing
+ - Win32: fix potential multi-threading issue
+ - Win32: simplify internal mingw_spawn* APIs
+ - Win32: let mingw_execve() return an int
+ (this branch uses sk/mingw-main and sk/mingw-uni-console.)
+
+
+* sp/complete-ext-alias (2014-06-13) 1 commit
+ (merged to 'next' on 2014-06-16 at 399679e)
+ + completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases
+
+ Will merge to 'master'.
+
+
+* bc/fix-rebase-merge-skip (2014-06-16) 1 commit
+ - rebase--merge: fix --skip with two conflicts in a row
+
+ "git rebase --skip" did not work well when it stopped due to a
+ conflict twice in a row.
+
+ Will merge to 'next'.
+
+
+* jl/submodule-tests (2014-06-16) 16 commits
+ - revert: add t3513 for submodule updates
+ - stash: add t3906 for submodule updates
+ - am: add t4255 for submodule updates
+ - cherry-pick: add t3512 for submodule updates
+ - pull: add t5572 for submodule updates
+ - SQUASH???
+ - rebase: add t3426 for submodule updates
+ - merge: add t7613 for submodule updates
+ - bisect: add t6041 for submodule updates
+ - reset: add t7112 for submodule updates
+ - read-tree: add t1013 for submodule updates
+ - apply: add t4137 for submodule updates
+ - checkout: call the new submodule update test framework
+ - submodules: Add the lib-submodule-update.sh test library
+ - SQUASH???
+ - test-lib: add test_dir_is_empty()
+
+ Expecting a reroll.
+
+
+* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit
+ - submodule: document "sync --recursive"
+
+ Will merge to 'next'.
+
+
+* pb/trim-trailing-spaces (2014-06-13) 1 commit
+ - t0008: do not depend on 'echo' handling backslashes specially
+
+ Will merge to 'next'.
+
+
+* po/error-message-style (2014-06-16) 1 commit
+ - doc: state coding guideline for error message punctuation
+
+ Expecting a reroll.
+
+
+* rs/blame-refactor (2014-06-13) 2 commits
+ - blame: simplify prepare_lines()
+ - blame: factor out get_next_line()
+
+ Will merge to 'next'.
+
+
+* rs/ref-transaction (2014-06-17) 48 commits
+ - refs.c: make write_ref_sha1 static
+ - fetch.c: change s_update_ref to use a ref transaction
+ - refs.c: propagate any errno==ENOTDIR from _commit back to the callers
+ - refs.c: pass a skip list to name_conflict_fn
+ - refs.c: call lock_ref_sha1_basic directly from commit
+ - refs.c: move the check for valid refname to lock_ref_sha1_basic
+ - refs.c: pass NULL as *flags to read_ref_full
+ - refs.c: pass the ref log message to _create/delete/update instead of _commit
+ - refs.c: make delete_ref use a transaction
+ - refs.c: make prune_ref use a transaction to delete the ref
+ - refs.c: remove lock_ref_sha1
+ - refs.c: remove the update_ref_write function
+ - refs.c: remove the update_ref_lock function
+ - refs.c: make lock_ref_sha1 static
+ - walker.c: use ref transaction for ref updates
+ - fast-import.c: use a ref transaction when dumping tags
+ - receive-pack.c: use a reference transaction for updating the refs
+ - refs.c: change update_ref to use a transaction
+ - branch.c: use ref transaction for all ref updates
+ - fast-import.c: change update_branch to use ref transactions
+ - sequencer.c: use ref transactions for all ref updates
+ - commit.c: use ref transactions for updates
+ - replace.c: use the ref transaction functions for updates
+ - tag.c: use ref transactions when doing updates
+ - refs.c: add transaction.status and track OPEN/CLOSED/ERROR
+ - refs.c: make ref_transaction_begin take an err argument
+ - refs.c: update ref_transaction_delete to check for error and return status
+ - refs.c: change ref_transaction_create to do error checking and return status
+ - refs.c: change ref_transaction_update() to do error checking and return status
+ - refs.c: remove the onerr argument to ref_transaction_commit
+ - update-ref: use err argument to get error from ref_transaction_commit
+ - refs.c: make update_ref_write update a strbuf on failure
+ - refs.c: add an err argument to delete_ref_loose
+ - refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
+ - refs.c: log_ref_write should try to return meaningful errno
+ - refs.c: make resolve_ref_unsafe set errno to something meaningful on error
+ - refs.c: commit_packed_refs to return a meaningful errno on failure
+ - refs.c: make remove_empty_directories alwasy set errno to something sane
+ - refs.c: verify_lock should set errno to something meaningful
+ - refs.c: make sure log_ref_setup returns a meaningful errno
+ - refs.c: add an err argument to repack_without_refs
+ - lockfile.c: make lock_file return a meaningful errno on failurei
+ - lockfile.c: add a new public function unable_to_lock_message
+ - refs.c: add a strbuf argument to ref_transaction_commit for error logging
+ - refs.c: allow passing NULL to ref_transaction_free
+ - refs.c: constify the sha arguments for ref_transaction_create|delete|update
+ - refs.c: ref_transaction_commit should not free the transaction
+ - refs.c: remove ref_transaction_rollback
+
+
+* ye/doc-http-proto (2014-06-16) 1 commit
+ - http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
+
+ Will merge to 'next'.
+
+
+* jk/pretty-G-format-fixes (2014-06-17) 5 commits
+ - pretty: avoid reading past end-of-string with "%G"
+ - t7510: check %G* pretty-format output
+ - t7510: test a commit signed by an unknown key
+ - t7510: use consistent &&-chains in loop
+ - t7510: stop referring to master in later tests
+
+
+* tb/unicode-7.0 (2014-06-17) 1 commit
+ - Update of unicode_width.h to Unicode Version 7.0
+
+--------------------------------------------------
+[Stalled]
+
+* cc/replace-graft (2014-06-09) 5 commits
+ - DONTMERGE: wise to wait for peff's commit->buffer length series
+ - contrib: add convert-grafts-to-replace-refs.sh
+ - Documentation: replace: add --graft option
+ - replace: add test for --graft
+ - replace: add --graft option
+
+ "git replace" learned a "--graft" option to rewrite parents of a
+ commit.
* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
Waiting for a reroll.
-* jl/submodule-recursive-checkout (2013-12-26) 5 commits
- - Teach checkout to recursively checkout submodules
- - submodule: teach unpack_trees() to update submodules
- - submodule: teach unpack_trees() to repopulate submodules
- - submodule: teach unpack_trees() to remove submodule contents
- - submodule: prepare for recursive checkout of submodules
-
- An RFCv2 exists ($gmane/241455) with sizable review comments.
- Expecting a reroll.
-
-
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
* jc/show-branch (2014-03-24) 5 commits
- - show-branch: use commit slab to represent bitflags of arbitrary width
- - show-branch.c: remove "all_mask"
- - show-branch.c: abstract out "flags" operation
- - show-branch.c: lift all_mask/all_revs to a global static
- - show-branch.c: update comment style
-
- Waiting for the final step to lift the hard-limit before sending it out.
-
---------------------------------------------------
-[Cooking]
-
-* sk/test-cmp-bin (2014-06-04) 1 commit
- (merged to 'next' on 2014-06-10 at 020a475)
- + t5000, t5003: do not use test_cmp to compare binary files
-
- Originally merged to 'next' on 2014-06-06
-
- Will merge to 'master'.
-
-
-* dt/refs-check-refname-component-optim (2014-06-05) 1 commit
- (merged to 'next' on 2014-06-10 at 4560669)
- + refs.c: optimize check_refname_component()
- (this branch is used by dt/refs-check-refname-component-sse42.)
-
- Originally merged to 'next' on 2014-06-06
-
- Will merge to 'master'.
-
-
-* jm/dedup-test-config (2014-06-05) 1 commit
- (merged to 'next' on 2014-06-10 at 8966f54)
- + t/t7810-grep.sh: remove duplicate test_config()
-
- Originally merged to 'next' on 2014-06-06
-
- Will merge to 'master'.
-
-
-* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
- (merged to 'next' on 2014-06-10 at fc63847)
- + commit -m: commit staged submodules regardless of ignore config
- + status/commit: show staged submodules regardless of ignore config
-
- Originally merged to 'next' on 2014-06-06
-
- submodule.*.ignore and diff.ignoresubmodules are used to ignore all
- submodule changes in "diff" output, but it can be confusing to
- apply these configuration values to status and commit.
-
- This is a backward-incompatible change, but should be so in a good
- way (aka bugfix).
-
- Will merge to 'master'.
-
-
-* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
- - git-gui: show staged submodules regardless of ignore config
-
- Tentatively queued what I expect to receive via Pat Thoyts.
-
-
-* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
- - gitk: show staged submodules regardless of ignore config
- - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
- - l10n: Init Vietnamese translation
-
- Tentatively queued what I expect to receive via Paul Mackerras.
-
-
-* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits
- (merged to 'next' on 2014-06-10 at eddb5bc)
- + transport-helper.c: rearrange xcalloc arguments
- + remote.c: rearrange xcalloc arguments
- + reflog-walk.c: rearrange xcalloc arguments
- + pack-revindex.c: rearrange xcalloc arguments
- + notes.c: rearrange xcalloc arguments
- + imap-send.c: rearrange xcalloc arguments
- + http-push.c: rearrange xcalloc arguments
- + diff.c: rearrange xcalloc arguments
- + config.c: rearrange xcalloc arguments
- + commit.c: rearrange xcalloc arguments
- + builtin/remote.c: rearrange xcalloc arguments
- + builtin/ls-remote.c: rearrange xcalloc arguments
-
- Originally merged to 'next' on 2014-06-06
-
- Like calloc(3), xcalloc() takes nmemb and then size.
-
- Will merge to 'master'.
-
-
-* jk/complete-merge-pull (2014-05-27) 2 commits
- (merged to 'next' on 2014-06-10 at d1524c5)
- + completion: add missing options for git-merge
- + completion: add a note that merge options are shared
-
- Originally merged to 'next' on 2014-06-06
-
- The completion code did not know about quite a few options that are
- common between "git merge" and "git pull", and a couple of options
- unique to "git merge".
-
- Will merge to 'master'.
-
-
-* jl/remote-rm-prune (2014-05-27) 3 commits
- (merged to 'next' on 2014-06-10 at 13259ff)
- + remote prune: optimize "dangling symref" check/warning
- + remote: repack packed-refs once when deleting multiple refs
- + remote rm: delete remote configuration as the last
-
- Originally merged to 'next' on 2014-06-06
-
- "git remote rm" and "git remote prune" can involve removing many
- refs at once, which is not a very efficient thing to do when very
- many refs exist in the packed-refs file.
-
- Will merge to 'master'.
-
-
-* jm/instaweb-apache-24 (2014-05-27) 1 commit
- (merged to 'next' on 2014-06-10 at ecf2048)
- + git-instaweb: add support for Apache 2.4
-
- Originally merged to 'next' on 2014-06-06
-
- Will merge to 'master'.
-
-
-* jm/t9138-style-fix (2014-05-27) 1 commit
- (merged to 'next' on 2014-06-10 at 034f13d)
- + t9138-git-svn-authors-prog.sh fixups
-
- Originally merged to 'next' on 2014-06-06
-
- Will merge to 'master'.
-
-
-* nd/daemonize-gc (2014-05-27) 1 commit
- (merged to 'next' on 2014-06-10 at 6fae7b0)
- + gc --auto: do not lock refs in the background
-
- Originally merged to 'next' on 2014-06-06
-
- "git gc --auto" was recently changed to run in the background to
- give control back early to the end-user sitting in front of the
- terminal, but it forgot that housekeeping involving reflogs should
- be done without other processes competing for accesses to the refs.
-
- Will merge to 'master'.
-
-
-* ow/config-mailmap-pathname (2014-05-27) 1 commit
- (merged to 'next' on 2014-06-10 at aba4ca2)
- + config: respect '~' and '~user' in mailmap.file
-
- Originally merged to 'next' on 2014-06-06
-
- mailmap.file configuration names a pathname, hence should honor
- ~/path and ~user/path as its value.
-
- Will merge to 'master'.
-
-
-* jm/doc-wording-tweaks (2014-05-28) 1 commit
- (merged to 'next' on 2014-06-10 at 5f2e094)
- + Documentation: wording fixes in the user manual and glossary
-
- Originally merged to 'next' on 2014-06-06
-
- Will merge to 'master'.
-
-
-* jc/fetch-push-refmap (2014-06-05) 9 commits
- (merged to 'next' on 2014-06-10 at 13c13ae)
- + fetch: allow explicit --refmap to override configuration
- + fetch doc: add a section on configured remote-tracking branches
- + fetch doc: remove "short-cut" section
- + fetch doc: update refspec format description
- + fetch doc: on pulling multiple refspecs
- + fetch doc: remove notes on outdated "mixed layout"
- + fetch doc: update note on '+' in front of the refspec
- + fetch doc: move FETCH_HEAD material lower and add an example
- + fetch doc: update introductory part for clarity
-
- Will merge to 'master'.
-
-
-* lt/log-auto-decorate (2014-05-30) 1 commit
- (merged to 'next' on 2014-06-10 at f149f4a)
- + git log: support "auto" decorations
-
- Originally merged to 'next' on 2014-06-06
-
- Will merge to 'master'.
-
-
-* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit
- (merged to 'next' on 2014-06-10 at abae695)
- + pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
-
- Originally merged to 'next' on 2014-06-06
-
- Avoid unnecessary copy of previous contents when extending the
- hashtable used in pack-objects.
-
- Will merge to 'master'.
-
-
-* jk/error-resolve-conflict-advice (2014-06-03) 2 commits
- (merged to 'next' on 2014-06-10 at 713ebe0)
- + error_resolve_conflict: drop quotations around operation
- + error_resolve_conflict: rewrap advice message
-
- Originally merged to 'next' on 2014-06-06
-
- Will merge to 'master'.
-
-
-* rs/read-ref-at (2014-06-03) 1 commit
- (merged to 'next' on 2014-06-10 at f58f2fc)
- + refs.c: change read_ref_at to use the reflog iterators
-
- Originally merged to 'next' on 2014-06-06
-
- Will merge to 'master'.
-
-
-* sh/enable-preloadindex (2014-06-03) 1 commit
- (merged to 'next' on 2014-06-10 at 7cedf2d)
- + environment.c: enable core.preloadindex by default
-
- Originally merged to 'next' on 2014-06-06
-
- Will merge to 'master'.
-
-
-* ta/string-list-init (2014-06-06) 1 commit
- (merged to 'next' on 2014-06-10 at bf209ff)
- + string-list: spell all values out that are given to a string_list initializer
-
- Originally merged to 'next' on 2014-06-06
-
- Will merge to 'master'.
-
-
-* jk/daemon-tolower (2014-05-23) 1 commit
- (merged to 'next' on 2014-06-10 at f3c549d)
- + daemon/config: factor out duplicate xstrdup_tolower
-
- Originally merged to 'next' on 2014-05-23
-
- Will merge to 'master'.
-
-
-* jk/strbuf-tolower (2014-05-23) 1 commit
- (merged to 'next' on 2014-06-10 at 01e6983)
- + strbuf: add strbuf_tolower function
-
- Originally merged to 'next' on 2014-05-23
-
- Will merge to 'master'.
-
-
-* jk/http-errors (2014-05-27) 8 commits
- (merged to 'next' on 2014-06-10 at 30e9212)
- + http: default text charset to iso-8859-1
- + remote-curl: reencode http error messages
- + strbuf: add strbuf_reencode helper
- + http: optionally extract charset parameter from content-type
- + http: extract type/subtype portion of content-type
- + t5550: test display of remote http error messages
- + t/lib-httpd: use write_script to copy CGI scripts
- + test-lib: preserve GIT_CURL_VERBOSE from the environment
-
- Originally merged to 'next' on 2014-06-06
-
- Propagate the error messages from the webserver better to the
- client coming over the HTTP transport.
-
- Will merge to 'master'.
+ - show-branch: use commit slab to represent bitflags of arbitrary width
+ - show-branch.c: remove "all_mask"
+ - show-branch.c: abstract out "flags" operation
+ - show-branch.c: lift all_mask/all_revs to a global static
+ - show-branch.c: update comment style
+ Waiting for the final step to lift the hard-limit before sending it out.
-* jm/format-patch-mail-sig (2014-05-27) 2 commits
- (merged to 'next' on 2014-06-10 at 310f59e)
- + format-patch: add "--signature-file=<file>" option
- + format-patch: make newline after signature conditional
+--------------------------------------------------
+[Cooking]
- Originally merged to 'next' on 2014-06-06
+* jc/fetch-pull-refmap (2014-06-12) 10 commits
+ (merged to 'next' on 2014-06-12 at 5428530)
+ + docs: Explain the purpose of fetch's and pull's <refspec> parameter.
+ (merged to 'next' on 2014-06-10 at 13c13ae)
+ + fetch: allow explicit --refmap to override configuration
+ + fetch doc: add a section on configured remote-tracking branches
+ + fetch doc: remove "short-cut" section
+ + fetch doc: update refspec format description
+ + fetch doc: on pulling multiple refspecs
+ + fetch doc: remove notes on outdated "mixed layout"
+ + fetch doc: update note on '+' in front of the refspec
+ + fetch doc: move FETCH_HEAD material lower and add an example
+ + fetch doc: update introductory part for clarity
Will merge to 'master'.
-* sk/wincred (2014-05-14) 2 commits
- (merged to 'next' on 2014-06-10 at 8d03e5a)
- + wincred: avoid overwriting configured variables
- + wincred: add install target
+* nd/split-index (2014-06-13) 32 commits
+ - t1700: new tests for split-index mode
+ - t2104: make sure split index mode is off for the version test
+ - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
+ - read-tree: note about dropping split-index mode or index version
+ - read-tree: force split-index mode off on --index-output
+ - rev-parse: add --shared-index-path to get shared index path
+ - update-index --split-index: do not split if $GIT_DIR is read only
+ - update-index: new options to enable/disable split index mode
+ - split-index: strip pathname of on-disk replaced entries
+ - split-index: do not invalidate cache-tree at read time
+ - split-index: the reading part
+ - split-index: the writing part
+ - read-cache: mark updated entries for split index
+ - read-cache: save deleted entries in split index
+ - read-cache: mark new entries for split index
+ - read-cache: split-index mode
+ - read-cache: save index SHA-1 after reading
+ - entry.c: update cache_changed if refresh_cache is set in checkout_entry()
+ - cache-tree: mark istate->cache_changed on prime_cache_tree()
+ - cache-tree: mark istate->cache_changed on cache tree update
+ - cache-tree: mark istate->cache_changed on cache tree invalidation
+ - unpack-trees: be specific what part of the index has changed
+ - resolve-undo: be specific what part of the index has changed
+ - update-index: be specific what part of the index has changed
+ - read-cache: be specific what part of the index has changed
+ - read-cache: be strict about "changed" in remove_marked_cache_entries()
+ - read-cache: store in-memory flags in the first 12 bits of ce_flags
+ - read-cache: relocate and unexport commit_locked_index()
+ - read-cache: new API write_locked_index instead of write_index/write_cache
+ - sequencer: do not update/refresh index if the lock cannot be held
+ - ewah: delete unused ewah_read_mmap_native declaration
+ - ewah: fix constness of ewah_read_mmap
- Originally merged to 'next' on 2014-05-21
- Will merge to 'master'.
+* ep/avoid-test-a-o (2014-06-10) 21 commits
+ - git-submodule.sh: avoid "echo" path-like values
+ - SQUASH: misconversion breakage fix
+ - git-submodule.sh: avoid "test <cond> -a/-o <cond>"
+ - t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
+ - t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
+ - git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
+ - git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
+ - git-bisect.sh: avoid "test <cond> -a/-o <cond>"
+ - contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
+ - contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
+ - contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
+ - contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
+ - contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
+ - check_bindir: avoid "test <cond> -a/-o <cond>"
-* as/pretty-truncate (2014-05-21) 5 commits
- (merged to 'next' on 2014-06-10 at d8147a2)
- + pretty.c: format string with truncate respects logOutputEncoding
- + t4205, t6006: add tests that fail with i18n.logOutputEncoding set
- + t4205 (log-pretty-format): use `tformat` rather than `format`
- + t4041, t4205, t6006, t7102: don't hardcode tested encoding value
- + t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
+* jc/revision-dash-count-parsing (2014-06-09) 1 commit
+ (merged to 'next' on 2014-06-10 at 1aeca19)
+ + revision: parse "git log -<count>" more carefully
- Originally merged to 'next' on 2014-05-23
+ "git log -2master" is a common typo that shows two commits starting
+ from whichever random branch that is not 'master' that happens to
+ be checked out currently.
Will merge to 'master'.
-* cc/replace-graft (2014-06-09) 5 commits
- - DONTMERGE: wise to wait for peff's commit->buffer length series
- - contrib: add convert-grafts-to-replace-refs.sh
- - Documentation: replace: add --graft option
- - replace: add test for --graft
- - replace: add --graft option
- (this branch uses cc/replace-edit.)
+* jc/test-lazy-prereq (2014-06-13) 7 commits
+ - tests: drop GIT_*_TIMING_TESTS environment variable support
+ (merged to 'next' on 2014-06-10 at 4f774f7)
+ + t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ + t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ + t3302: do not chdir around in the primary test process
+ + t3302: coding style updates
+ + test: turn USR_BIN_TIME into a lazy prerequisite
+ + test: turn EXPENSIVE into a lazy prerequisite
- "git replace" learned a "--graft" option to rewrite parents of a
- commit.
+ Test-script clean-up. The last step might be controversial.
+ Will merge to 'master' except for the last one.
-* jk/argv-array-for-child-process (2014-05-15) 7 commits
- (merged to 'next' on 2014-06-10 at 07a167b)
- + argv-array: drop "detach" code
- + get_importer: use run-command's internal argv_array
- + get_exporter: use argv_array
- + get_helper: use run-command's internal argv_array
- + git_connect: use argv_array
- + run_column_filter: use argv_array
- + run-command: store an optional argv_array
- Originally merged to 'next' on 2014-05-21
+* jk/commit-buffer-length (2014-06-13) 18 commits
+ (merged to 'next' on 2014-06-16 at b2d2d7b)
+ + reuse cached commit buffer when parsing signatures
+ + commit: record buffer length in cache
+ + commit: convert commit->buffer to a slab
+ + commit-slab: provide a static initializer
+ + use get_commit_buffer everywhere
+ + convert logmsg_reencode to get_commit_buffer
+ + use get_commit_buffer to avoid duplicate code
+ + use get_cached_commit_buffer where appropriate
+ + provide helpers to access the commit buffer
+ + provide a helper to set the commit buffer
+ + provide a helper to free commit buffer
+ + sequencer: use logmsg_reencode in get_message
+ + logmsg_reencode: return const buffer
+ + do not create "struct commit" with xcalloc
+ + commit: push commit_index update into alloc_commit_node
+ + alloc: include any-object allocations in alloc_report
+ + replace dangerous uses of strbuf_attach
+ + commit_tree: take a pointer/len pair rather than a const strbuf
+
+ Move "commit->buffer" out of the in-core commit object and keep
+ track of their lengths. Use this to optimize the code paths to
+ validate GPG signatures in commit objects.
Will merge to 'master'.
-* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
- (merged to 'next' on 2014-06-10 at 984862b)
- + run_diff_files: do not look at uninitialized stat data
-
- Originally merged to 'next' on 2014-05-21
+* jm/api-strbuf-doc (2014-06-09) 1 commit
+ (merged to 'next' on 2014-06-10 at 831aa30)
+ + api-strbuf.txt minor typos
Will merge to 'master'.
-* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
- (merged to 'next' on 2014-06-10 at 299ea28)
- + open_sha1_file: report "most interesting" errno
-
- Originally merged to 'next' on 2014-05-21
+* rs/more-starts-with (2014-06-09) 1 commit
+ (merged to 'next' on 2014-06-10 at efcd02e)
+ + Use starts_with() for C strings instead of memcmp()
Will merge to 'master'.
-* rr/rebase-autostash-fix (2014-05-20) 2 commits
- (merged to 'next' on 2014-06-10 at afd0c29)
- + rebase -i: test "Nothing to do" case with autostash
- + rebase -i: handle "Nothing to do" case with autostash
+* sk/mingw-dirent (2014-06-09) 5 commits
+ - Win32 dirent: improve dirent implementation
+ - Win32 dirent: clarify #include directives
+ - Win32 dirent: change FILENAME_MAX to MAX_PATH
+ - Win32 dirent: remove unused dirent.d_reclen member
+ - Win32 dirent: remove unused dirent.d_ino member
- Originally merged to 'next' on 2014-05-21
- Will merge to 'master'.
+* sk/mingw-main (2014-06-10) 2 commits
+ - mingw: avoid const warning
+ - Win32: move main macro to a function
+ (this branch is used by sk/mingw-uni-console and sk/mingw-unicode-spawn-args.)
-* sk/windows-unc-path (2014-06-10) 1 commit
- (merged to 'next' on 2014-06-10 at 3598cc6)
- + Windows: allow using UNC path for git repository
- (this branch is used by sk/mingw-main and sk/mingw-uni-console.)
+* sk/mingw-uni-console (2014-06-16) 7 commits
+ - Win32: reliably detect console pipe handles
+ - Win32: fix broken pipe detection
+ - Win32: Thread-safe windows console output
+ - Win32: add Unicode conversion functions
+ - Win32: warn if the console font doesn't support Unicode
+ - Win32: detect console streams more reliably
+ - Win32: support Unicode console output
+ (this branch is used by sk/mingw-unicode-spawn-args; uses sk/mingw-main.)
- Originally merged to 'next' on 2014-05-21
+ Now, are Windows folks happy with all four mingw topics?
+
+
+* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit
+ (merged to 'next' on 2014-06-10 at 374082c)
+ + t5551: fix the 50,000 tag test
Will merge to 'master'.
-* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
- (merged to 'next' on 2014-06-10 at 0cd28d7)
- + move "--follow needs one pathspec" rule to diff_setup_done
+* jk/repack-pack-keep-objects (2014-06-10) 3 commits
+ (merged to 'next' on 2014-06-16 at 89716c9)
+ + repack: s/write_bitmap/&s/ in code
+ + repack: respect pack.writebitmaps
+ + repack: do not accidentally pack kept objects by default
+ (this branch is used by jk/repack-pack-writebitmaps-config.)
- Originally merged to 'next' on 2014-05-23
+ Recent updates to "git repack" started to duplicate objects that
+ are in packfiles marked with .keep flag into the new packfile by
+ mistake.
Will merge to 'master'.
-* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
- (merged to 'next' on 2014-06-10 at 745b05c)
- + t/lib-httpd: require SANITY prereq
-
- Originally merged to 'next' on 2014-05-21
+* jk/repack-pack-writebitmaps-config (2014-06-12) 4 commits
+ (merged to 'next' on 2014-06-16 at 777005d)
+ + t7700: drop explicit --no-pack-kept-objects from .keep test
+ + repack: introduce repack.writeBitmaps config option
+ + repack: simplify handling of --write-bitmap-index
+ + pack-objects: stop respecting pack.writebitmaps
+ (this branch uses jk/repack-pack-keep-objects.)
Will merge to 'master'.
-* cb/byte-order (2014-05-30) 3 commits
- (merged to 'next' on 2014-06-10 at 63db8ee)
- + compat/bswap.h: fix endianness detection
- + compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
- + compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
+* mg/verify-commit (2014-06-10) 3 commits
+ - verify-commit: scriptable commit signature verification
+ - gpg-interface: provide access to the payload
+ - pretty: free the gpg status buf
- Originally merged to 'next' on 2014-05-30
+ What is queued here is v1; v2 exists but I skipped it.
+ Expecting a reroll.
- Compatibility enhancement for Solaris.
+
+* nd/init-restore-env (2014-06-10) 1 commit
+ (merged to 'next' on 2014-06-16 at ecbbfca)
+ + git potty: restore environments after alias expansion
Will merge to 'master'.
-* cc/replace-edit (2014-05-19) 10 commits
- (merged to 'next' on 2014-06-10 at ff69722)
- + Documentation: replace: describe new --edit option
- + replace: add --edit to usage string
- + replace: add tests for --edit
- + replace: die early if replace ref already exists
- + replace: refactor checking ref validity
- + replace: make sure --edit results in a different object
- + replace: add --edit option
- + replace: factor object resolution out of replace_object
- + replace: use OPT_CMDMODE to handle modes
- + replace: refactor command-mode determination
- (this branch is used by cc/replace-graft.)
+* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
+ - git-gui: show staged submodules regardless of ignore config
- Originally merged to 'next' on 2014-05-19
+ Tentatively queued what I expect to receive via Pat Thoyts.
- "git replace" learns a new "--edit" option.
- Will merge to 'master'.
+* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
+ - gitk: show staged submodules regardless of ignore config
+ - gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
+ - l10n: Init Vietnamese translation
+
+ Will drop, as I heard from Paul that these are queued in his tree.
* mt/send-email-cover-to-cc (2014-06-10) 3 commits
Will merge to 'master'.
-* ib/test-selectively-run (2014-06-06) 4 commits
- (merged to 'next' on 2014-06-10 at 1235570)
- + t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
- + test-lib: '--run' to run only specific tests
- + test-lib: tests skipped by GIT_SKIP_TESTS say so
- + test-lib: document short options in t/README
-
- Originally merged to 'next' on 2014-06-06
-
- Allow specifying only certain individual test pieces to be run
- using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
-
- Will merge to 'master'.
-
-
-* fc/remote-helper-refmap (2014-04-21) 8 commits
- (merged to 'next' on 2014-06-10 at 8cd8cf8)
- + transport-helper: remove unnecessary strbuf resets
- + transport-helper: add support to delete branches
- + fast-export: add support to delete refs
- + fast-import: add support to delete refs
- + transport-helper: add support to push symbolic refs
- + transport-helper: add support for old:new refspec
- + fast-export: add new --refspec option
- + fast-export: improve argument parsing
-
- Originally merged to 'next' on 2014-04-22
-
- Allow remote-helper/fast-import based transport to rename the refs
- while transferring the history.
-
-
-* mt/patch-id-stable (2014-06-10) 5 commits
+* mt/patch-id-stable (2014-06-10) 1 commit
- patch-id: change default to stable
- (merged to 'next' on 2014-06-10 at b75e70f)
- + patch-id-test: test stable and unstable behaviour
- + patch-id: make it stable against hunk reordering
- + test doc: test_write_lines does not split its arguments
- + test: add test_write_lines helper
- Originally merged to 'next' on 2014-05-07
+--------------------------------------------------
+[Discarded]
- Introduce a new way to compute patch-id for a patch that is not
- affected by the order of the paths that appear in the input.
+* jl/submodule-recursive-checkout (2013-12-26) 5 commits
+ . Teach checkout to recursively checkout submodules
+ . submodule: teach unpack_trees() to update submodules
+ . submodule: teach unpack_trees() to repopulate submodules
+ . submodule: teach unpack_trees() to remove submodule contents
+ . submodule: prepare for recursive checkout of submodules
- Will merge to 'master' except for the last one.
+ Dropped for now to make room for another topic ($gmane/251521)
projects / thirdparty / git.git / commitdiff
