To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Aug 2013, #03; Tue, 13)
-X-master-at: 425df881e08bed7a8fcc9a23f452cff792f9ec6c
-X-next-at: 80e72f1fb22b04aabd28f14eb96d1beb23e37b9d
+Subject: What's cooking in git.git (Aug 2013, #04; Thu, 15)
+X-master-at: 2c2b6646c2723459dbd334c7ced6f77ffb0d596e
+X-next-at: c3113b0f8e8c144de8253871ce8abb30e7d58465
-What's cooking in git.git (Aug 2013, #03; Tue, 13)
+What's cooking in git.git (Aug 2013, #04; Thu, 15)
--------------------------------------------------
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 -rc3 has been tagged; we will need to revert a7365313 (git
-stash: avoid data loss when "git stash save" kills a directory,
-2013-06-28) that is killing "git stash" in repositories with too
-many untracked cruft and plan to reapply it after trying to whip
-"ls-files --killed" into a reasonable performer before the final.
+Unfortunately, due to regression two topics were reverted but
+without prejudice (i.e. these reverts do not mean what these topics
+tried to achieve have been rejected---they just need to be redone
+without introducing the regression):
+
+ * An attempted fix to "git stash save", to detect that going back
+ to the state of the HEAD needs to lose killed files, and/or
+ untracked files in a killed directory, to prevent the command
+ from proceeding without "--force".
+
+ This used "ls-files -k" that was unusably slow.
+
+ * An attempted enhancement to allow "@" to be used to name "HEAD".
+
+ This rewrote "@" in a ref where it shouldn't have,
+ e.g. refs/@/foo.
+
+The schedule for 1.8.4 has been updated to have an extra rc this
+weekend (1.8.4-rc4) in order to make sure these reverts do not have
+unexpected fallout, even though I do not anticipate any. The final
+has to be delayed by a week, and the current plan is to tag it on
+Aug 23rd (see http://tinyurl.com/gitCal).
+
+A new topic to optimize "ls-files -k" has been posted, and it may
+help resurrect the "git stash save" topic after 1.8.4 release.
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"]
+[New Topics]
+
+* jc/ls-files-killed-optim (2013-08-15) 3 commits
+ - t3010: update to demonstrate "ls-files -k" optimization pitfalls
+ - ls-files -k: a directory only can be killed if the index has a non-directory
+ - dir.c: use the cache_* macro to access the current index
-* sb/mailmap-updates (2013-08-12) 1 commit
- + .mailmap: update long-lost friends with multiple defunct addresses
+ "git ls-files -k" needs to crawl only the part of the working tree
+ that may overlap the paths in the index to find killed files, but
+ shared code with the logic to find all the untracked files, which
+ made it unnecessarily inefficient.
+
+ Will merge to and cook in 'next'.
--------------------------------------------------
-[New Topics]
+[Stalled]
+
+* tf/gitweb-ss-tweak (2013-07-15) 4 commits
+ - gitweb: make search help link less ugly
+ - gitweb: omit the repository owner when it is unset
+ - gitweb: vertically centre contents of page footer
+ - gitweb: ensure OPML text fits inside its box
+
+ Comments?
+
+
+* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
+ - ### DONTMERGE: needs better explanation on what config they need
+ - pack-refs.c: Add missing call to git_config()
+ - show-ref.c: Add missing call to git_config()
+
+ The changes themselves are probably good, but it is unclear what
+ basic setting needs to be read for which exact operation.
+
+ Waiting for clarification.
+ $gmane/228294
+
+
+* jh/shorten-refname (2013-05-07) 4 commits
+ - t1514: refname shortening is done after dereferencing symbolic refs
+ - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
+ - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
+ - t1514: Add tests of shortening refnames in strict/loose mode
+
+ When remotes/origin/HEAD is not a symbolic ref, "rev-parse
+ --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
+ "origin/HEAD", which is fixed with this series (if it is a symbolic
+ ref that points at remotes/origin/something, then it should show
+ "origin/something" and it already does).
+
+ Expecting a reroll, as an early part of a larger series.
+ $gmane/225137
+
+
+* jk/list-objects-sans-blobs (2013-06-06) 4 commits
+ . archive: ignore blob objects when checking reachability
+ . list-objects: optimize "revs->blob_objects = 0" case
+ . upload-archive: restrict remote objects with reachability check
+ . clear parsed flag when we free tree buffers
+
+ Attempt to allow "archive --remote=$there $arbitrary_sha1" while
+ keeping the reachability safety.
+
+ Seems to break some tests in a trivial and obvious way.
+
+
+* mg/more-textconv (2013-05-10) 7 commits
+ - grep: honor --textconv for the case rev:path
+ - grep: allow to use textconv filters
+ - t7008: demonstrate behavior of grep with textconv
+ - cat-file: do not die on --textconv without textconv filters
+ - show: honor --textconv for blobs
+ - diff_opt: track whether flags have been set explicitly
+ - t4030: demonstrate behavior of show with textconv
+
+ Make "git grep" and "git show" pay attention to --textconv when
+ dealing with blob objects.
+
+ I thought this was pretty well designed and executed, but it seems
+ there are some doubts on the list; kicked back to 'pu'.
+
+
+* jc/format-patch (2013-04-22) 2 commits
+ - format-patch: --inline-single
+ - format-patch: rename "no_inline" field
+
+ A new option to send a single patch to the standard output to be
+ appended at the bottom of a message. I personally have no need for
+ this, but it was easy enough to cobble together. Tests, docs and
+ stripping out more MIMEy stuff are left as exercises to interested
+ parties.
+
+ Not ready for inclusion.
+
+ Will discard unless we hear from anybody who is interested in
+ tying its loose ends.
+
+
+* jk/gitweb-utf8 (2013-04-08) 4 commits
+ - gitweb: Fix broken blob action parameters on blob/commitdiff pages
+ - gitweb: Don't append ';js=(0|1)' to external links
+ - gitweb: Make feed title valid utf8
+ - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
+
+ Various fixes to gitweb.
+
+ Drew Northup volunteered to take a look into this.
+ $gmane/226216
+
+
+* jc/show-branch (2013-06-07) 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]
* es/blame-L-twice (2013-08-06) 16 commits
(merged to 'next' on 2013-08-08 at 9d6f821)
* ap/remote-hg-tilde-is-home-directory (2013-08-09) 1 commit
- - remote-hg: fix path when cloning with tilde expansion
+ (merged to 'next' on 2013-08-14 at cd963e3)
+ + remote-hg: fix path when cloning with tilde expansion
- Will merge to and cook in 'next'.
+ Will cook in 'next'.
* es/rebase-i-no-abbrev (2013-08-11) 3 commits
- - rebase: interactive: fix short SHA-1 collision
- - t3404: rebase: interactive: demonstrate short SHA-1 collision
- - t3404: restore specialized rebase-editor following commentchar test
+ (merged to 'next' on 2013-08-14 at d449e0e)
+ + rebase: interactive: fix short SHA-1 collision
+ + t3404: rebase: interactive: demonstrate short SHA-1 collision
+ + t3404: restore specialized rebase-editor following commentchar test
- Will merge to and cook in 'next'.
+ Will cook in 'next'.
* fc/remote-hg-shared-setup (2013-08-11) 2 commits
- - remote-hg: add shared repo upgrade
- - remote-hg: ensure shared repo is initialized
+ (merged to 'next' on 2013-08-14 at aae6858)
+ + remote-hg: add shared repo upgrade
+ + remote-hg: ensure shared repo is initialized
- Will merge to and cook in 'next'.
+ Will cook in 'next'.
* jc/transport-do-not-use-connect-twice-in-fetch (2013-08-07) 5 commits
* mm/war-on-whatchanged (2013-08-13) 2 commits
- - whatchanged: document its historical nature
- - core-tutorial: trim the section on Inspecting Changes
+ (merged to 'next' on 2013-08-14 at fe77c11)
+ + whatchanged: document its historical nature
+ + core-tutorial: trim the section on Inspecting Changes
- Will merge to and cook in 'next'.
+ Will cook in 'next'.
* nd/gc-lock-against-each-other (2013-08-09) 1 commit
- - gc: reject if another gc is running, unless --force is given
+ (merged to 'next' on 2013-08-14 at 6999651)
+ + gc: reject if another gc is running, unless --force is given
- Will merge to and cook in 'next'.
+ Will cook in 'next'.
* rt/doc-merge-file-diff3 (2013-08-09) 1 commit
- - Documentation/git-merge-file: document option "--diff3"
+ (merged to 'next' on 2013-08-14 at 1e5847b)
+ + Documentation/git-merge-file: document option "--diff3"
- Will merge to and cook in 'next'.
+ Will cook in 'next'.
* sb/misc-cleanup (2013-08-09) 3 commits
- - rm: remove unneeded null pointer check
- - diff: fix a possible null pointer dereference
- - diff: remove ternary operator evaluating always to true
+ (merged to 'next' on 2013-08-14 at 9e7ff9a)
+ + rm: remove unneeded null pointer check
+ + diff: fix a possible null pointer dereference
+ + diff: remove ternary operator evaluating always to true
- Will merge to and cook in 'next'.
+ Will cook in 'next'.
* aj/p4-symlink-lose-nl (2013-08-12) 1 commit
- - git-p4: Fix occasional truncation of symlink contents.
+ (merged to 'next' on 2013-08-14 at a4959b7)
+ + git-p4: Fix occasional truncation of symlink contents.
- Will merge to and cook in 'next'.
+ Will cook in 'next'.
* es/contacts-blame-L-multi (2013-08-13) 3 commits
- - contacts: reduce git-blame invocations
- - contacts: gather all blame sources prior to invoking git-blame
- - contacts: validate hunk length earlier
+ (merged to 'next' on 2013-08-14 at 551ed3d)
+ + contacts: reduce git-blame invocations
+ + contacts: gather all blame sources prior to invoking git-blame
+ + contacts: validate hunk length earlier
(this branch uses es/blame-L-more and es/blame-L-twice.)
- Will merge to and cook in 'next'.
+ Will cook in 'next'.
* fc/unpack-trees-leakfix (2013-08-13) 1 commit
- - unpack-trees: plug a memory leak
+ (merged to 'next' on 2013-08-14 at 989f329)
+ + unpack-trees: plug a memory leak
- Will merge to and cook in 'next'.
+ Will cook in 'next'.
* nd/push-no-thin (2013-08-13) 1 commit
- - push: respect --no-thin
+ (merged to 'next' on 2013-08-14 at b2d0fa9)
+ + push: respect --no-thin
- Will merge to and cook in 'next'.
+ Will cook in 'next'.
* sh/pull-rebase-preserve (2013-08-13) 1 commit
- - pull: Allow pull to preserve merges when rebasing.
-
- Will merge to and cook in 'next'.
+ (merged to 'next' on 2013-08-14 at 99a85dd)
+ + pull: Allow pull to preserve merges when rebasing.
---------------------------------------------------
-[Stalled]
-
-* tf/gitweb-ss-tweak (2013-07-15) 4 commits
- - gitweb: make search help link less ugly
- - gitweb: omit the repository owner when it is unset
- - gitweb: vertically centre contents of page footer
- - gitweb: ensure OPML text fits inside its box
-
- Comments?
-
-
-* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
- - ### DONTMERGE: needs better explanation on what config they need
- - pack-refs.c: Add missing call to git_config()
- - show-ref.c: Add missing call to git_config()
-
- The changes themselves are probably good, but it is unclear what
- basic setting needs to be read for which exact operation.
-
- Waiting for clarification.
- $gmane/228294
-
-
-* jh/shorten-refname (2013-05-07) 4 commits
- - t1514: refname shortening is done after dereferencing symbolic refs
- - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
- - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
- - t1514: Add tests of shortening refnames in strict/loose mode
-
- When remotes/origin/HEAD is not a symbolic ref, "rev-parse
- --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
- "origin/HEAD", which is fixed with this series (if it is a symbolic
- ref that points at remotes/origin/something, then it should show
- "origin/something" and it already does).
-
- Expecting a reroll, as an early part of a larger series.
- $gmane/225137
-
-
-* jk/list-objects-sans-blobs (2013-06-06) 4 commits
- . archive: ignore blob objects when checking reachability
- . list-objects: optimize "revs->blob_objects = 0" case
- . upload-archive: restrict remote objects with reachability check
- . clear parsed flag when we free tree buffers
-
- Attempt to allow "archive --remote=$there $arbitrary_sha1" while
- keeping the reachability safety.
-
- Seems to break some tests in a trivial and obvious way.
-
-
-* mg/more-textconv (2013-05-10) 7 commits
- - grep: honor --textconv for the case rev:path
- - grep: allow to use textconv filters
- - t7008: demonstrate behavior of grep with textconv
- - cat-file: do not die on --textconv without textconv filters
- - show: honor --textconv for blobs
- - diff_opt: track whether flags have been set explicitly
- - t4030: demonstrate behavior of show with textconv
-
- Make "git grep" and "git show" pay attention to --textconv when
- dealing with blob objects.
-
- I thought this was pretty well designed and executed, but it seems
- there are some doubts on the list; kicked back to 'pu'.
-
-
-* jc/format-patch (2013-04-22) 2 commits
- - format-patch: --inline-single
- - format-patch: rename "no_inline" field
-
- A new option to send a single patch to the standard output to be
- appended at the bottom of a message. I personally have no need for
- this, but it was easy enough to cobble together. Tests, docs and
- stripping out more MIMEy stuff are left as exercises to interested
- parties.
-
- Not ready for inclusion.
-
- Will discard unless we hear from anybody who is interested in
- tying its loose ends.
-
-
-* jk/gitweb-utf8 (2013-04-08) 4 commits
- - gitweb: Fix broken blob action parameters on blob/commitdiff pages
- - gitweb: Don't append ';js=(0|1)' to external links
- - gitweb: Make feed title valid utf8
- - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
-
- Various fixes to gitweb.
-
- Drew Northup volunteered to take a look into this.
- $gmane/226216
-
-
-* jc/show-branch (2013-06-07) 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
+ Will cook in 'next'.
- Waiting for the final step to lift the hard-limit before sending it out.
-
---------------------------------------------------
-[Cooking]
* es/blame-L-more (2013-08-05) 11 commits
(merged to 'next' on 2013-08-06 at 2679f3e)
Convert most uses of OPT_BOOLEAN/OPTION_BOOLEAN that can use
OPT_BOOL/OPTION_BOOLEAN which have much saner semantics, and turn
- remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary;
- there seems to be some misconversion that makes many tests fail,
- though.
+ remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary.
Will cook in 'next'.
(merged to 'next' on 2013-07-30 at 8a9964c)
+ fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL
- Will cook in 'next'.
+ Will drop.
+
+ sb/parseopt-boolean-removal contains the moral equivalent of this
+ change.
* rr/feed-real-path-to-editor (2013-07-29) 1 commit
projects / thirdparty / git.git / commitdiff
