Re: What's cooking (interim report)

[Jeff King]

On Wed, Aug 03, 2016 at 04:06:20PM -0700, Junio C Hamano wrote:

> * jk/parseopt-string-list (2016-08-03) 1 commit
>  - blame: drop strdup of string literal
> 
>  A recent API change to parse_opt_string_list() introduced a small
>  unintended memory leak in the command line parsing of "git blame",
>  which has been plugged.
> 
>  Will merge to 'next'.

Actually, the leak was always there. It's just that
parse_opt_string_list used to leak _too_, and it was fixed, but this
case left behind.

Not that it matters too much. I doubt this one is exciting enough to
make it into the release notes. :)

> * jk/pack-objects-optim-mru (2016-07-29) 1 commit
>  - pack-objects: use mru list when iterating over packs
>  (this branch uses jk/pack-objects-optim.)
> 
>  This is still questionable in that it can attempt to create a cycle
>  in delta-chain, only to be stopped by the last-ditch recovery logic
>  in there.

I've been doing some thinking and experimenting on this. I'll try to
write up the current status tonight.

-Peff
--
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 (interim report)

[Stefan Beller]

On Wed, Aug 3, 2016 at 4:06 PM, Junio C Hamano  wrote:
>
> * sb/submodule-update-dot-branch (2016-08-01) 7 commits
>  - submodule update: allow '.' for branch value
>  - submodule--helper: add remote-branch helper
>  - submodule-config: keep configured branch around
>  - submodule--helper: fix usage string for relative-path
>  - submodule update: narrow scope of local variable
>  - submodule update: respect depth in subsequent fetches
>  - t7406: future proof tests with hard coded depth
>
>  A few updates to "git submodule update".
>
>  Will merge to 'next'.

I sent out replacements for the two tip most commits
about 2 hours ago, hopefully they make it in before the merge to next,
otherwise I'll resend on top of these.

Thanks,
Stefan
--
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 (interim report)

[Junio C Hamano]

Quite a many topics have been merged to 'master' and 'next'.

As I just did a full "What's cooking" yesterday, I'd only list the
new topics and "highlights", the latter of which are what would
benefit from the last round of eyeballs from reviewers.

Many topics have been in 'Cooking' section even though they do not
show any progress; I'll start moving them to 'Stalled' and then
'Discarded' soonish.  Note that "Discarded" does not mean "Rejected,
don't talk about this ever again"; it merely means "With remaining
issue left unaddressed, I do not see a point in keeping it in my
tree right now".

--
[New Topics]

* jh/clean-smudge-f-doc (2016-08-03) 1 commit
 - clarify %f documentation

 Split out from a stalled jh/clean-smudge-annex topic before
 discarding it.

 Will merge to 'next'.


* jh/status-v2-porcelain (2016-08-03) 8 commits
 - status: tests for --porcelain=v2
 - git-status.txt: describe --porcelain=v2 format
 - status: print branch info with --porcelain=v2 --branch
 - status: print per-file porcelain v2 status data
 - status: per-file data collection for --porcelain=v2
 - status: support --porcelain[=]
 - status: cleanup API to wt_status_print
 - status: rename long-format print routines

 Enhance "git status --porcelain" output by collecting more data on
 the state of the index and the working tree files, which may
 further be used to teach git-prompt (in contrib/) to make fewer
 calls to git.


* jk/parseopt-string-list (2016-08-03) 1 commit
 - blame: drop strdup of string literal

 A recent API change to parse_opt_string_list() introduced a small
 unintended memory leak in the command line parsing of "git blame",
 which has been plugged.

 Will merge to 'next'.


* js/import-tars-hardlinks (2016-08-03) 1 commit
 - import-tars: support hard links

 "import-tars" fast-import script (in contrib/) used to ignore a
 hardlink target and replaced it with an empty file, which has been
 corrected to record the same blob as the other file the hardlink is
 shared with.


* js/t4130-rename-without-ino (2016-08-03) 1 commit
 - t4130: work around Windows limitation

 Windows port was failing some tests in t4130, due to the lack of
 inum in the returned values by its lstat(2) emulation.

 Will merge to 'next' and then to 'master' and then to 'maint'.


* nd/fbsd-lazy-mtime (2016-08-03) 2 commits
 - SQUASH???
 - t7063: work around FreeBSD's lazy mtime update feature

 FreeBSD can lie when asked mtime of a directory, which made the
 untracked cache code to fall back to a slow-path, which in turn
 caused tests in t7063 to fail because it wanted to verify the
 behaviour of the fast-path.

 Waiting for a response to SQUASH???


* sb/submodule-recommend-shallowness (2016-08-03) 1 commit
 - gitmodules: document shallow recommendation

 Doc update.

 Will merge to 'next'.

--
[Cooking]

* ew/build-time-pager-tweaks (2016-08-03) 2 commits
 - SQUASH???
 - pager: move pager-specific setup into the build

 The build procedure learned PAGER_ENV knob that lists what default
 environment variable settings to export for popular pagers.  This
 mechanism is used to tweak the default settings to MORE on FreeBSD.

 Expecting a reroll.


* ib/t3700-add-chmod-x-updates (2016-08-01) 3 commits
  (merged to 'next' on 2016-08-03 at 1753346)
 + t3700: add a test_mode_in_index helper function
 + t3700: merge two tests into one
 + t3700: remove unwanted leftover files before running new tests

 The t3700 test about "add --chmod=-x" have been made a bit more
 robust and generally cleaned up.

 Will merge to 'master'.

This may want to go to 'maint'.


* sb/submodule-update-dot-branch (2016-08-01) 7 commits
 - submodule update: allow '.' for branch value
 - submodule--helper: add remote-branch helper
 - submodule-config: keep configured branch around
 - submodule--helper: fix usage string for relative-path
 - submodule update: narrow scope of local variable
 - submodule update: respect depth in subsequent fetches
 - t7406: future proof tests with hard coded depth

 A few updates to "git submodule update".

 Will merge to 'next'.


* jc/hashmap-doc-init (2016-08-02) 1 commit
 - hashmap: clarify that hashmap_entry can safely be discarded

 The API documentation for hashmap was unclear if hashmap_entry
 can be safely discarded without any other consideration.  State
 that it is safe to do so.


* jk/pack-objects-optim-mru (2016-07-29) 1 commit
 - pack-objects: use mru list when iterating over packs
 (this branch uses jk/pack-objects-optim.)

 This is still questionable in that it can attempt to create a cycle
 in delta-chain, only to be stopped by the last-ditch recovery logic
 in there.


* kw/patch-ids-optim (2016-07-29) 4 commits
 - rebase: avoid computing unnecessary patch IDs
 - patch-ids: add flag to create the diff patch id using header only data
 - patch-ids: replace the seen indicator with a commit pointer
 - patch-ids: stop using a 

What's cooking (interim report)

[Junio C Hamano]

I'll do the next issue of What's cooking after tomorrow's
integration cycle, but here are the highlights.

The following topics that have already graduated to the 'master'
branch have been merged to the 'maint' branch (see the last What's
cooking for details of individual topics):

ms/subtree-fixlets
ss/nedmalloc-compilation
jc/maint-fnmatch-old-style-definition
jc/test-portability
jc/maint-fbsd-sh-ifs-workaround
jc/mkstemp-more-careful-error-reporting
jc/test-cvs-no-init-in-existing-dir
jc/maint-test-portability

In addition, the following two patches have been directly applied to
the 'maint' branch:

t1402: work around shell quoting issue on NetBSD
remote-hg: Fix biridectionality - bidirectionality typos

We will have other bugfix topics merged to 'maint' and hopefully can
tag v1.8.1.1 sometime next week.

The following topics that have been cooking on 'next' have been
merged to the 'master' branch:

kb/maint-bundle-doc
as/test-name-alias-uniquely
ta/remove-stale-translated-tut
tb/test-t9810-no-sed-i
tb/test-t9020-no-which
jk/maint-fast-import-doc-dedup-done
jk/pathspec-literal

Most of these will later be merged to 'maint'.

These topics have been merged to the 'next' branch:

rs/zip-with-uncompressed-size-in-the-header
rs/zip-tests
jn/xml-depends-on-asciidoc-conf
jc/comment-cygwin-win32api-in-makefile
as/api-allocation-doc
jk/unify-exit-code-by-receiving-signal
rs/leave-base-name-in-name-field-of-tar
jl/interrupt-clone-remove-separate-git-dir
jc/merge-blobs
mo/cvs-server-updates
as/dir-c-cleanup
jk/config-uname

Also several new topics are parked in 'pu' and I think they are all
ready for 'next'.

Thanks.
--
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