Subject: Re: What's cooking in git.git (Apr 2015, #04; Mon, 27)

From: Junio C Hamano <[email-masked]>
Date: Wed, 29 Apr 2015 15:42:57 -0700

Junio C Hamano <[email-masked]> writes:

> Here are the topics that have been cooking.  Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.
> ...

There are a handful of topics that are almost there but not
finished.  Could the topic owners and area submaintainers who are
involved in them report their current status soonish, please, to
help me decide to keep or discard them?

Thanks.

> * kk/log-merges-config (2015-04-21) 5 commits
>  - bash-completion: add support for git-log --merges= and log.merges
>  - t4202-log: add tests for --merges=
>  - Documentation: add git-log --merges= option and log.merges config. var
>  - log: honor log.merges= option
>  - revision: add --merges={show|only|hide} option
>
>  "git log" (but not other commands in the "log" family) learned to
>  pay attention to the log.merges configuration variable that can be
>  set to "show" (the normal behaviour), "only" (hide non-merge
>  commits), or "hide" (hide merge commits).  --merges=(show|only|hide)
>  can be used to override the setting from the command line.

> * mh/fdopen-with-retry (2015-03-06) 6 commits
>  - buffer_fdinit(): use fdopen_with_retry()
>  - update_info_file(): use fdopen_with_retry()
>  - copy_to_log(): use fdopen_with_retry()
>  - fdopen_lock_file(): use fdopen_with_retry()
>  - SQUASH??? $gmane/264889
>  - xfdopen(): if first attempt fails, free memory and try again
>
>  Various parts of the code where they call fdopen() can fail when
>  they run out of memory; attempt to proceed by retrying the
>  operation after freeing some resource.

> * mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
>  - t/lib-git-svn: check same httpd module dirs as lib-httpd
>  - t/lib-httpd: load mod_unixd
>
>  This is the first two commits in a three-patch series $gmane/266962

> * jk/at-push-sha1 (2015-03-31) 6 commits
>  - sha1_name: implement @{push} shorthand
>  - sha1_name: refactor upstream_mark
>  - remote.c: provide per-branch pushremote name
>  - remote.c: hoist branch.*.remote lookup out of remote_get_1
>  - remote.c: drop "remote" pointer from "struct branch"
>  - remote.c: drop default_remote_name variable
>
>  Introduce <branch>@{push} short-hand to denote the remote-tracking
>  branch that tracks the branch at the remote the <branch> would be
>  pushed to.
>
>  Waiting for a reroll ($gmane/266573).

> * pt/xdg-config-path (2015-04-12) 7 commits
>  - path.c: remove home_config_paths()
>  - git-config: replace use of home_config_paths()
>  - git-commit: replace use of home_config_paths()
>  - credential-store.c: replace home_config_paths() with xdg_config_home()
>  - dir.c: replace home_config_paths() with xdg_config_home()
>  - attr.c: replace home_config_paths() with xdg_config_home()
>  - path.c: implement xdg_config_home()
>  (this branch uses pt/credential-xdg.)
>
>  Seen some discussions.
>  Waiting for a reroll ($gmane/267518).

> * mh/numparse (2015-03-19) 14 commits
>  - diff_opt_parse(): use convert_i() when handling --abbrev=<num>
>  - diff_opt_parse(): use convert_i() when handling "-l<num>"
>  - opt_arg(): simplify pointer handling
>  - opt_arg(): report errors parsing option values
>  - opt_arg(): use convert_i() in implementation
>  - opt_arg(): val is always non-NULL
>  - builtin_diff(): detect errors when parsing --unified argument
>  - handle_revision_opt(): use convert_ui() when handling "--abbrev="
>  - strtoul_ui(), strtol_i(): remove functions
>  - handle_revision_opt(): use convert_i() when handling "-<digit>"
>  - handle_revision_opt(): use skip_prefix() in many places
>  - write_subdirectory(): use convert_ui() for parsing mode
>  - cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"
>  - numparse: new module for parsing integral numbers
>
>  Many codepaths use unchecked use of strtol() and friends (or even
>  worse, atoi()).  Introduce a set of wrappers that try to be more
>  careful.
>
>  Waiting for a reroll ($gmane/266209).

> * tf/gitweb-project-listing (2015-03-19) 5 commits
>  - gitweb: make category headings into links when they are directories
>  - gitweb: optionally set project category from its pathname
>  - gitweb: add a link under the search box to clear a project filter
>  - gitweb: if the PATH_INFO is incomplete, use it as a project_filter
>  - gitweb: fix typo in man page
>
>  Update gitweb to make it more pleasant to deal with a hierarchical
>  forest of repositories.
>
>  Any comments from those who use or have their own code in Gitweb?

> * nd/list-files (2015-02-09) 21 commits
>  - t3080: tests for git-list-files
>  - list-files: -M aka diff-cached
>  - list-files -F: show submodules with the new indicator '&'
>  - list-files: add -F/--classify
>  - list-files: show directories as well as files
>  - list-files: do not show duplicate cached entries
>  - list-files: sort output and remove duplicates
>  - list-files: add -t back
>  - list-files: add -1 short for --no-column
>  - list-files: add -R/--recursive short for --max-depth=-1
>  - list-files: -u does not imply showing stages
>  - list-files: make alias 'ls' default to 'list-files'
>  - list-files: a user friendly version of ls-files and more
>  - ls-files: support --max-depth
>  - ls-files: add --column
>  - ls-files: add --color to highlight file names
>  - ls-files: buffer full item in strbuf before printing
>  - ls_colors.c: highlight submodules like directories
>  - ls_colors.c: add a function to color a file name
>  - ls_colors.c: parse color.ls.* from config file
>  - ls_colors.c: add $LS_COLORS parsing code
>
>  A new "git list-files" Porcelain command, "ls-files" with bells and
>  whistles.
>
>  Reroll to base on wt-status work ($gmane/265142) has seen some
>  positive discussions.
>
>  Waiting for a further polished reroll ($gmane/265534).

> * js/fsck-opt (2015-01-21) 19 commits
>  - fsck: support ignoring objects in `git fsck` via fsck.skiplist
>  - fsck: git receive-pack: support excluding objects from fsck'ing
>  - fsck: introduce `git fsck --quick`
>  - fsck: support demoting errors to warnings
>  - fsck: document the new receive.fsck.* options
>  - fsck: allow upgrading fsck warnings to errors
>  - fsck: optionally ignore specific fsck issues completely
>  - fsck: disallow demoting grave fsck errors to warnings
>  - fsck: add a simple test for receive.fsck.*
>  - fsck: make fsck_tag() warn-friendly
>  - fsck: handle multiple authors in commits specially
>  - fsck: make fsck_commit() warn-friendly
>  - fsck: make fsck_ident() warn-friendly
>  - fsck: report the ID of the error/warning
>  - fsck: allow demoting errors to warnings via receive.fsck.warn = <key>
>  - fsck: offer a function to demote fsck errors to warnings
>  - fsck: provide a function to parse fsck message IDs
>  - fsck: introduce identifiers for fsck messages
>  - fsck: introduce fsck options
>
>  "fsck.warnings = <list of error tokens>" I suggested turned out to
>  be an unpopular choice (sorry Dscho).
>
>  Expecting a reroll.