Re: What's cooking in git.git (Jun 2014, #06; Thu, 26)
Johannes Sixt writes: > Am 27.06.2014 00:02, schrieb Junio C Hamano: >> Four mingw series are still in limbo--are they in good enough shape >> for Windows folks who wanted to upstream them? > > I've now tested the Unicode patches a bit, and I didn't notice a > regression in my use-cases. The patches are good to go, IMHO. Thanks; let's merge them to 'next' and down to 'master' in a week or two, then. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jun 2014, #06; Thu, 26)
Am 27.06.2014 00:02, schrieb Junio C Hamano: > Four mingw series are still in limbo--are they in good enough shape > for Windows folks who wanted to upstream them? I've now tested the Unicode patches a bit, and I didn't notice a regression in my use-cases. The patches are good to go, IMHO. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jun 2014, #06; Thu, 26)
On Fri, Jun 27, 2014 at 5:02 AM, Junio C Hamano wrote: > * 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 > > What's the doneness of this one? It's done, at least for the extension format and core algorithm. Later we may want to automatically re-split the index when too many changes are accumulated in the main index. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
What's cooking in git.git (Jun 2014, #06; Thu, 26)
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Fixes accumulated on the 'master' front made into 2.0.1. The topics
in flight continue to separate into two distinct layers (i.e.
stalled-and-need-to-be-rerolld vs sure-to-graduate-soon).
Four mingw series are still in limbo--are they in good enough shape
for Windows folks who wanted to upstream them?
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--
[Graduated to "master"]
* ep/avoid-test-a-o (2014-06-19) 20 commits
(merged to 'next' on 2014-06-20 at c47322b)
+ git-submodule.sh: avoid "echo" path-like values
+ git-submodule.sh: avoid "test -a/-o "
+ t/test-lib-functions.sh: avoid "test -a/-o "
+ t/t9814-git-p4-rename.sh: avoid "test -a/-o "
+ t/t5538-push-shallow.sh: avoid "test -a/-o "
+ t/t5403-post-checkout-hook.sh: avoid "test -a/-o "
+ t/t5000-tar-tree.sh: avoid "test -a/-o "
+ t/t4102-apply-rename.sh: avoid "test -a/-o "
+ t/t0026-eol-config.sh: avoid "test -a/-o "
+ t/t0025-crlf-auto.sh: avoid "test -a/-o "
+ t/lib-httpd.sh: avoid "test -a/-o "
+ git-rebase--interactive.sh: avoid "test -a/-o "
+ git-mergetool.sh: avoid "test -a/-o "
+ git-bisect.sh: avoid "test -a/-o "
+ contrib/examples/git-resolve.sh: avoid "test -a/-o "
+ contrib/examples/git-repack.sh: avoid "test -a/-o "
+ contrib/examples/git-merge.sh: avoid "test -a/-o "
+ contrib/examples/git-commit.sh: avoid "test -a/-o "
+ contrib/examples/git-clone.sh: avoid "test -a/-o "
+ check_bindir: avoid "test -a/-o "
Update tests and scripts to avoid "test ... -a ...", which is often
more error-prone than "test ... && test ...".
Squashed misconversion fix-up into git-submodule.sh updates.
* 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
* 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.)
Recent updates to "git repack" started to duplicate objects that
are in packfiles marked with .keep flag into the new packfile by
mistake.
* 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.)
* jm/dedup-name-compare (2014-06-20) 2 commits
+ cleanup duplicate name_compare() functions
+ name-hash.c: replace cache_name_compare() with memcmp(3)
* mc/doc-submodule-sync-recurse (2014-06-13) 1 commit
(merged to 'next' on 2014-06-20 at 04815e3)
+ submodule: document "sync --recursive"
* 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
* 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
* pb/trim-trailing-spaces (2014-06-13) 1 commit
(merged to 'next' on 2014-06-20 at 6985153)
+ t0008: do not depend on 'echo' handling backslashes specially
* rs/blame-refactor (2014-06-13) 2 commits
(merged to 'next' on 2014-06-20 at ddaa722)
+ blame: simplify prepare_lines()
+ blame: factor out get_next_line()
* 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
* tb/unicode-7.0-display-width (2014-06-18) 1 commit
(merged to 'next' on 2014-06-20 at 111b246)
+ Update of unicode_width.h to Unicode Version 7.0
* ye/doc-http-proto (2014-06-16) 1 commit
(merged to 'next' on 2014-06-20 at 24f347d)
+ http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
--
[New Topics]
* jc/fix-clone-single-starting-at-a-tag (2014-06-23) 1 commit
- builtin/clone.c: detect a clone starting at a tag correctly
Will merge to 'next'.
--
[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.
Expecting a reroll on top of
