What's cooking in git.git (Jun 2017, #04; Tue, 13)

What's cooking in git.git (Jun 2017, #04; Tue, 13)

[Junio C Hamano]

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 ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto 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"]

* jc/diff-tree-stale-comment (2017-06-02) 1 commit
  (merged to 'next' on 2017-06-04 at bffae281d2)
 + diff-tree: update stale in-code comments

 Comment fix.


* jc/noent-notdir (2017-05-30) 2 commits
  (merged to 'next' on 2017-06-04 at 7cb4efbc3c)
 + treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checked
 + compat-util: is_missing_file_error()

 Our code often opens a path to an optional file, to work on its
 contents when we can successfully open it.  We can ignore a failure
 to open if such an optional file does not exist, but we do want to
 report a failure in opening for other reasons (e.g. we got an I/O
 error, or the file is there, but we lack the permission to open).

 The exact errors we need to ignore are ENOENT (obviously) and
 ENOTDIR (less obvious).  Instead of repeating comparison of errno
 with these two constants, introduce a helper function to do so.


* jk/pack-idx-corruption-safety (2017-06-07) 1 commit
  (merged to 'next' on 2017-06-07 at 31f94e174d)
 + t5313: make extended-table test more deterministic

 A flaky test has been corrected.


* nd/fopen-errors (2017-06-02) 13 commits
  (merged to 'next' on 2017-06-04 at 7a755e73bb)
 + mingw_fopen: report ENOENT for invalid file names
 + mingw: verify that paths are not mistaken for remote nicknames
 + log: fix memory leak in open_next_file()
 + rerere.c: move error_errno() closer to the source system call
 + print errno when reporting a system call error
 + wrapper.c: make warn_on_inaccessible() static
 + wrapper.c: add and use fopen_or_warn()
 + wrapper.c: add and use warn_on_fopen_errors()
 + config.mak.uname: set FREAD_READS_DIRECTORIES for Darwin, too
 + config.mak.uname: set FREAD_READS_DIRECTORIES for Linux and FreeBSD
 + clone: use xfopen() instead of fopen()
 + use xfopen() in more places
 + git_fopen: fix a sparse 'not declared' warning

 We often try to open a file for reading whose existence is
 optional, and silently ignore errors from open/fopen; report such
 errors if they are not due to missing files.


* rf/completion (2017-06-02) 6 commits
  (merged to 'next' on 2017-06-04 at dde1e34703)
 + completion: add git config credentialCache.ignoreSIGHUP
 + completion: add git config credential completions
 + completion: add git config advice completions
 + completion: add git config am.threeWay completion
 + completion: add git config core completions
 + completion: add git config gc completions

 Completion updates.


* sb/submodule-blanket-recursive (2017-06-01) 9 commits
  (merged to 'next' on 2017-06-04 at 418bb03032)
 + builtin/fetch.c: respect 'submodule.recurse' option
 + builtin/push.c: respect 'submodule.recurse' option
 + builtin/grep.c: respect 'submodule.recurse' option
 + Introduce 'submodule.recurse' option for worktree manipulators
 + submodule loading: separate code path for .gitmodules and config overlay
 + reset/checkout/read-tree: unify config callback for submodule recursion
 + submodule test invocation: only pass additional arguments
 + submodule recursing: do not write a config variable twice
 + Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursive

 Many commands learned to pay attention to submodule.recurse
 configuration.

 It is not known if a simple "yes/no" is sufficient in the longer
 term, and what should happen when --recurse-submodules option starts
 taking "recurse into them how?" parameter, though.

--------------------------------------------------
[New Topics]

* js/alias-early-config (2017-06-13) 6 commits
 - Use the early config machinery to expand aliases
 - t7006: demonstrate a problem with aliases in subdirectories
 - t1308: relax the test verifying that empty alias values are disallowed
 - help: use early config when autocorrecting aliases
 - config: report correct line number upon error
 - discover_git_directory(): avoid setting invalid git_dir

 The code to pick up and execute command alias definition from the
 configuration used to switch to the top of the working tree and
 then come back when the expanded alias was executed, which was
 unnecessarilyl complex.  Attempt to simplify the logic by using the
 early-config mechanism that does not chdir around.

 Waiting for discussion to settle.


* pc/dir-count-slashes (2017-06-12) 1 commit
 - dir: create function count_slashes()

 Three instances of the same helper function have been consolidated
 to one.

 Will merge to 'next'.


* sb/t4005-modernize (2017-06-10) 1 commit
 - t4005: modernize style and drop hard coded sha1

 Test clean-up.

 Will merge to 'next'.


* ah/filter-branch-setup (2017-06-12) 2 commits
 - filter-branch: add [--] to usage
 - filter-branch: add `--setup` step

 "filter-branch" learned a pseudo filter "--setup" that can be used
 to define a common function/variable that can be used by other
 filters.

 Will merge to 'next'.


* bw/config-h (2017-06-13) 4 commits
 - config: don't implicitly use gitdir
 - config: don't include config.h by default
 - config: remove git_config_iter
 - config: create config.h

 Code clean-up.


* bw/ls-files-sans-the-index (2017-06-13) 17 commits
 - ls-files: factor out tag calculation
 - ls-files: factor out debug info into a function
 - ls-files: convert show_files to take an index
 - ls-files: convert show_ce_entry to take an index
 - ls-files: convert prune_cache to take an index
 - ls-files: convert ce_excluded to take an index
 - ls-files: convert show_ru_info to take an index
 - ls-files: convert show_other_files to take an index
 - ls-files: convert show_killed_files to take an index
 - ls-files: convert write_eolinfo to take an index
 - ls-files: convert overlay_tree_on_cache to take an index
 - tree: convert read_tree to take an index parameter
 - convert: convert renormalize_buffer to take an index
 - convert: convert convert_to_git to take an index
 - convert: convert convert_to_git_filter_fd to take an index
 - convert: convert crlf_to_git to take an index
 - convert: convert get_cached_convert_stats_ascii to take an index

 Code clean-up.


* jc/pretty-add-again (2017-06-13) 1 commit
 - add_again() off-by-one error in custom format


* jk/warn-add-gitlink (2017-06-13) 2 commits
 - t: move "git add submodule" into test blocks
 - add: warn when adding an embedded repository

 Using "git add d/i/r" when d/i/r is the top of the working tree of
 a separate repository would create a gitlink in the index, which
 would appear as a not-quite-initialized submodule to others.  We
 learned to give warnings when this happens.


* km/test-mailinfo-b-failure (2017-06-12) 1 commit
 - t5100: add some more mailinfo tests

 New tests.

 Will merge to 'next'.


* ls/github (2017-06-13) 1 commit
 - Configure Git contribution guidelines for github.com

 Help contributors that visit us at GitHub.

 Will merge to 'next'.


* mh/fast-import-raise-default-depth (2017-06-12) 1 commit
 - fast-import: increase the default pack depth to 50

 "fast-import" uses a default pack chain depth that is consistent
 with other parts of the system.

 Will merge to 'next'.


* mh/packed-ref-store-prep (2017-06-12) 1 commit
 - lock_packed_refs(): fix cache validity check

 Bugfix for a topic that is (only) in 'master'.

 Will merge to 'next'.


* ps/stash-push-pathspec-fix (2017-06-13) 1 commit
 - git-stash: fix pushing stash with pathspec from subdir

 "git stash push <pathspec>" did not work from a subdirectory at all.
 Bugfix for a topic in v2.13

 Will merge to 'next'.


* sb/submodule-doc (2017-06-13) 1 commit
 - submodules: overhaul documentation

 Doc update.


* sd/t3200-branch-m-test (2017-06-13) 1 commit
 - t3200: add test for single parameter passed to -m option

 New test.

 Will merge to 'next'.


* sd/branch-copy (2017-06-13) 3 commits
 - branch: add a --copy (-c) option to go with --move (-m)
 - branch: add test for -m renaming multiple config sections
 - config: create a function to format section headers

 "git branch" learned "-c/-C" to create and switch to a new branch
 by copying an existing one.


--------------------------------------------------
[Stalled]

* mg/status-in-progress-info (2017-05-10) 2 commits
 - status --short --inprogress: spell it as --in-progress
 - status: show in-progress info for short status

 "git status" learns an option to report various operations
 (e.g. "merging") that the user is in the middle of.

 cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>


* mg/name-rev-debug (2017-03-31) 2 commits
 - describe: pass --debug down to name-rev
 - name-rev: provide debug output

 "git describe --debug --contains" did not add any meaningful
 information, even though without "--contains" it did.

 Will discard for now.
 cf. <c85bc2a1-56d8-8a02-6089-2b8cb3d39e99@grubix.eu>


* nd/worktree-move (2017-04-20) 6 commits
 - worktree remove: new command
 - worktree move: refuse to move worktrees with submodules
 - worktree move: accept destination as directory
 - worktree move: new command
 - worktree.c: add update_worktree_location()
 - worktree.c: add validate_worktree()

 "git worktree" learned move and remove subcommands.

 Expecting a reroll.
 cf. <20170420101024.7593-1-pclouds@gmail.com>
 cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
 cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>


* sk/dash-is-previous (2017-03-01) 5 commits
 . revert.c: delegate handling of "-" shorthand to setup_revisions
 . sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
 . revision.c: args starting with "-" might be a revision
 . revision.c: swap if/else blocks
 . revision.c: do not update argv with unknown option

 A dash "-" can be written to mean "the branch that was previously
 checked out" in more places.

 Ejected, as it seems that making -.. to mean @{-1}..HEAD etc. are
 going too far.

--------------------------------------------------
[Cooking]

* bw/object-id (2017-06-05) 33 commits
  (merged to 'next' on 2017-06-13 at 0582278759)
 + diff: rename diff_fill_sha1_info to diff_fill_oid_info
 + diffcore-rename: use is_empty_blob_oid
 + tree-diff: convert path_appendnew to object_id
 + tree-diff: convert diff_tree_paths to struct object_id
 + tree-diff: convert try_to_follow_renames to struct object_id
 + builtin/diff-tree: cleanup references to sha1
 + diff-tree: convert diff_tree_sha1 to struct object_id
 + notes-merge: convert write_note_to_worktree to struct object_id
 + notes-merge: convert verify_notes_filepair to struct object_id
 + notes-merge: convert find_notes_merge_pair_ps to struct object_id
 + notes-merge: convert merge_from_diffs to struct object_id
 + notes-merge: convert notes_merge* to struct object_id
 + tree-diff: convert diff_root_tree_sha1 to struct object_id
 + combine-diff: convert find_paths_* to struct object_id
 + combine-diff: convert diff_tree_combined to struct object_id
 + diff: convert diff_flush_patch_id to struct object_id
 + patch-ids: convert to struct object_id
 + diff: finish conversion for prepare_temp_file to struct object_id
 + diff: convert reuse_worktree_file to struct object_id
 + diff: convert fill_filespec to struct object_id
 + diff: convert diff_change to struct object_id
 + diff: convert run_diff_files to struct object_id
 + diff: convert diff_addremove to struct object_id
 + diff: convert diff_index_show_file to struct object_id
 + diff: convert get_stat_data to struct object_id
 + grep: convert to struct object_id
 + notes: convert some accessor functions to struct object_id
 + builtin/notes: convert to struct object_id
 + notes: convert format_display_notes to struct object_id
 + notes: make get_note return pointer to struct object_id
 + notes: convert for_each_note to struct object_id
 + notes: convert internal parts to struct object_id
 + notes: convert internal structures to struct object_id

 Conversion from uchar[20] to struct object_id continues.

 Will merge to 'master'.


* rs/strbuf-addftime-zZ (2017-06-10) 2 commits
 - date: use localtime() for "-local" time formats
 - strbuf: let strbuf_addftime handle %z and %Z itself

 As there is no portable way to pass timezone information to
 strftime, some output format from "git log" and friends are
 impossible to produce.  Teach our own strbuf_addftime to replace %z
 and %Z with caller-supplied values to help working around this.

 Will merge to 'next'.


* sb/submodule-rm-absorb (2017-06-04) 1 commit
  (merged to 'next' on 2017-06-13 at ed902e8fb4)
 + Documentation/git-rm: correct submodule description

 Doc update to a recently graduated topic.

 Will merge to 'master'.


* sg/revision-parser-skip-prefix (2017-06-12) 5 commits
 - revision.c: use skip_prefix() in handle_revision_pseudo_opt()
 - revision.c: use skip_prefix() in handle_revision_opt()
 - revision.c: stricter parsing of '--early-output'
 - revision.c: stricter parsing of '--no-{min,max}-parents'
 - revision.h: turn rev_info.early_output back into an unsigned int

 Code clean-up.

 Will merge to 'next'.


* ab/perf-remove-index-lock (2017-06-05) 1 commit
  (merged to 'next' on 2017-06-13 at c532e59233)
 + perf: work around the tested repo having an index.lock

 When an existing repository is used for t/perf testing, we first
 create bit-for-bit copy of it, which may grab a transient state of
 the repository and freeze it into the repository used for testing,
 which then may cause Git operations to fail.  Single out "the index
 being locked" case and forcibly drop the lock from the copy.

 Will merge to 'master'.


* ls/filter-process-delayed (2017-06-01) 5 commits
 - convert: add "status=delayed" to filter process protocol
 - convert: move multiple file filter error handling to separate function
 - t0021: write "OUT" only on success
 - t0021: make debug log file name configurable
 - t0021: keep filter log files on comparison

 The filter-process interface learned to allow a process with long
 latency give a "delayed" response.

 Needs review.


* jk/consistent-h (2017-06-05) 8 commits
  (merged to 'next' on 2017-06-13 at e09c1fe968)
 + t0012: test "-h" with builtins
 + git: add hidden --list-builtins option
 + version: convert to parse-options
 + diff- and log- family: handle "git cmd -h" early
 + submodule--helper: show usage for "-h"
 + remote-{ext,fd}: print usage message on invalid arguments
 + upload-archive: handle "-h" option early
 + credential: handle invalid arguments earlier

 "git $cmd -h" for builtin commands calls the implementation of the
 command (i.e. cmd_$cmd() function) without doing any repository
 set-up, and the commands that expect RUN_SETUP is done by the Git
 potty needs to be prepared to show the help text without barfing.

 Will merge to 'master'.


* pw/rebase-i-regression-fix-tests (2017-06-01) 1 commit
 - rebase -i: add test for reflog message

 Just the first one of three? new tests that follows up a regression
 fix.

 Expecting a portable update.


* ab/pcre-v2 (2017-06-02) 8 commits
  (merged to 'next' on 2017-06-13 at 34bf49ee44)
 + grep: add support for PCRE v2
 + grep: un-break building with PCRE >= 8.32 without --enable-jit
 + grep: un-break building with PCRE < 8.20
 + grep: un-break building with PCRE < 8.32
 + grep: add support for the PCRE v1 JIT API
 + log: add -P as a synonym for --perl-regexp
 + grep: skip pthreads overhead when using one thread
 + grep: don't redundantly compile throwaway patterns under threading

 Update "perl-compatible regular expression" support to enable JIT
 and also allow linking with the newer PCRE v2 library.

 Will merge to 'master'.


* jk/pathspec-magic-disambiguation (2017-05-29) 6 commits
  (merged to 'next' on 2017-06-13 at 088987f033)
 + verify_filename(): flip order of checks
 + verify_filename(): treat ":(magic)" as a pathspec
 + check_filename(): handle ":^" path magic
 + check_filename(): use skip_prefix
 + check_filename(): refactor ":/" handling
 + t4208: add check for ":/" without matching file

 The convention for a command line is to follow "git cmdname
 --options" with revisions followed by an optional "--"
 disambiguator and then finally pathspecs.  When "--" is not there,
 we make sure early ones are all interpretable as revs (and do not
 look like paths) and later ones are the other way around.  A
 pathspec with "magic" (e.g. ":/p/a/t/h" that matches p/a/t/h from
 the top-level of the working tree, no matter what subdirectory you
 are working from) are conservatively judged as "not a path", which
 required disambiguation more often.  The command line parser
 learned to say "it's a pathspec" a bit more often when the syntax
 looks like so.

 Will merge to 'master'.


* ab/sha1dc (2017-06-07) 2 commits
 - sha1collisiondetection: automatically enable when submodule is populated
 - sha1dc: optionally use sha1collisiondetection as a submodule

 The "collission-detecting" implementation of SHA-1 hash we borrowed
 from is replaced by directly binding the upstream project as our
 submodule.

 Will keep in 'pu'.
 Impact to the various build and release infrastructure of using
 submodule is not yet fully known, but this lets us dip our toes.


* bp/fsmonitor (2017-06-12) 6 commits
 - fsmonitor: add a sample query-fsmonitor hook script for Watchman
 - fsmonitor: add documentation for the fsmonitor extension.
 - fsmonitor: add test cases for fsmonitor extension
 - fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.
 - dir: make lookup_untracked() available outside of dir.c
 - bswap: add 64 bit endianness helper get_be64

 We learned to talk to watchman to speed up "git status".

 Waiting for discussion to settle.


* sb/diff-color-move (2017-06-01) 17 commits
 - diff.c: color moved lines differently
 - diff: buffer all output if asked to
 - diff.c: emit_line includes whitespace highlighting
 - diff.c: convert diff_summary to use emit_line_*
 - diff.c: convert diff_flush to use emit_line_*
 - diff.c: convert word diffing to use emit_line_*
 - diff.c: convert show_stats to use emit_line_*
 - diff.c: convert emit_binary_diff_body to use emit_line_*
 - submodule.c: convert show_submodule_summary to use emit_line_fmt
 - diff.c: convert emit_rewrite_lines to use emit_line_*
 - diff.c: convert emit_rewrite_diff to use emit_line_*
 - diff.c: convert builtin_diff to use emit_line_*
 - diff.c: convert fn_out_consume to use emit_line
 - diff: introduce more flexible emit function
 - diff.c: factor out diff_flush_patch_all_file_pairs
 - diff: move line ending check into emit_hunk_header
 - diff: readability fix

 "git diff" has been taught to optionally paint new lines that are
 the same as deleted lines elsewhere differently from genuinely new
 lines.

 Are we happy with these changes?


* xz/send-email-batch-size (2017-05-23) 1 commit
 - send-email: --batch-size to work around some SMTP server limit

 "git send-email" learned to overcome some SMTP server limitation
 that does not allow many pieces of e-mails to be sent over a single
 session.

 Waiting for response.
 cf. <CACBZZX5GYV50rjg9X602JHqFPaoofH9TwDf_-r_MDu8-rmNV6Q@mail.gmail.com>


* sg/clone-refspec-from-command-line-config (2017-06-01) 2 commits
 - Documentation/clone: document ignored configuration variables
 - clone: respect additional configured fetch refspecs during initial fetch

 "git clone -c var=val" is a way to set configuration variables in
 the resulting repository, but it is more useful to also make these
 variables take effect while the initial clone is happening,
 e.g. these configuration variables could be fetch refspecs.

 Are we happy with these two?


* js/rebase-i-final (2017-05-02) 10 commits
 - rebase -i: rearrange fixup/squash lines using the rebase--helper
 - t3415: test fixup with wrapped oneline
 - rebase -i: skip unnecessary picks using the rebase--helper
 - rebase -i: check for missing commits in the rebase--helper
 - t3404: relax rebase.missingCommitsCheck tests
 - rebase -i: also expand/collapse the SHA-1s via the rebase--helper
 - rebase -i: do not invent onelines when expanding/collapsing SHA-1s
 - rebase -i: remove useless indentation
 - rebase -i: generate the script via rebase--helper
 - t3415: verify that an empty instructionFormat is handled as before

 The final batch to "git rebase -i" updates to move more code from
 the shell script to C.

 Expecting a reroll.
 This is at its v4.
 cf. <cover.1493414945.git.johannes.schindelin@gmx.de>


* nd/prune-in-worktree (2017-04-24) 12 commits
 - rev-list: expose and document --single-worktree
 - revision.c: --reflog add HEAD reflog from all worktrees
 - files-backend: make reflog iterator go through per-worktree reflog
 - revision.c: --all adds HEAD from all worktrees
 - refs: remove dead for_each_*_submodule()
 - revision.c: use refs_for_each*() instead of for_each_*_submodule()
 - refs: add refs_head_ref()
 - refs: move submodule slash stripping code to get_submodule_ref_store
 - refs.c: refactor get_submodule_ref_store(), share common free block
 - revision.c: --indexed-objects add objects from all worktrees
 - revision.c: refactor add_index_objects_to_pending()
 - revision.h: new flag in struct rev_info wrt. worktree-related refs

 "git gc" and friends when multiple worktrees are used off of a
 single repository did not consider the index and per-worktree refs
 of other worktrees as the root for reachability traversal, making
 objects that are in use only in other worktrees to be subject to
 garbage collection.

 Expecting a reroll.
 Has been waiting for nd/worktree-kill-parse-ref to settle.
 cf. <CACsJy8ADCVBiLoPg_Tz0L6CMdh_eFmK4RYzfQ-PmUgBK7w9e=A@mail.gmail.com>

Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[Jonathan Nieder]

Jun 13, 2017 at 02:40:16PM -0700, Junio C Hamano wrote:

> * sb/submodule-blanket-recursive (2017-06-01) 9 commits
>   (merged to 'next' on 2017-06-04 at 418bb03032)
>  + builtin/fetch.c: respect 'submodule.recurse' option
>  + builtin/push.c: respect 'submodule.recurse' option
>  + builtin/grep.c: respect 'submodule.recurse' option
>  + Introduce 'submodule.recurse' option for worktree manipulators
>  + submodule loading: separate code path for .gitmodules and config overlay
>  + reset/checkout/read-tree: unify config callback for submodule recursion
>  + submodule test invocation: only pass additional arguments
>  + submodule recursing: do not write a config variable twice
>  + Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursive
>
>  Many commands learned to pay attention to submodule.recurse
>  configuration.

Yay!

>  It is not known if a simple "yes/no" is sufficient in the longer
>  term, and what should happen when --recurse-submodules option starts
>  taking "recurse into them how?" parameter, though.

Any pointers for where this has been discussed, if anywhere (e.g. was
it in the thread
http://public-inbox.org/git/20170526191017.19155-1-sbeller@google.com)?
I'm hoping that we can make the defaults work well enough that a
simple "true/false" becomes sufficient.

Perhaps this is something that the documentation at
http://public-inbox.org/git/20170607185354.10050-1-sbeller@google.com
can go into, since it is an opinionated piece of documentation that
describes commonalities between submodule-related commands and how
they are meant to fit into a user's daily life.

[...]
> * bw/config-h (2017-06-13) 4 commits
>  - config: don't implicitly use gitdir
>  - config: don't include config.h by default
>  - config: remove git_config_iter
>  - config: create config.h
>
>  Code clean-up.

Patches 1-3 are good to go IMHO.

Patch 4 in pu is marked with my Reviewed-by.  I think it's getting
there but not there yet.  Did some script pull the tag from my reply
to the cover letter?  (I'm asking so that if so I can cooperate better
with such a script in the future and avoid false positive
Reviewed-bys.)

[...]
> * jk/warn-add-gitlink (2017-06-13) 2 commits
>  - t: move "git add submodule" into test blocks
>  - add: warn when adding an embedded repository
>
>  Using "git add d/i/r" when d/i/r is the top of the working tree of
>  a separate repository would create a gitlink in the index, which
>  would appear as a not-quite-initialized submodule to others.  We
>  learned to give warnings when this happens.

Note to self that we may want to put a note about this (and more
generally about the git-series style of caller that creates a GITLINK
entry that is not for a submodule) in the document being written at
http://public-inbox.org/git/20170607185354.10050-1-sbeller@google.com
or in some other document like gitrepository-layout.txt.

[...]
> * ls/github (2017-06-13) 1 commit
>  - Configure Git contribution guidelines for github.com
>
>  Help contributors that visit us at GitHub.
>
>  Will merge to 'next'.

\o/ Thank you.

[...]
> --------------------------------------------------
> [Stalled]
>
> * mg/status-in-progress-info (2017-05-10) 2 commits
>  - status --short --inprogress: spell it as --in-progress
>  - status: show in-progress info for short status
>
>  "git status" learns an option to report various operations
>  (e.g. "merging") that the user is in the middle of.
>
>  cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>

Thanks for the poke.  This looks a quite nice change, but I agree with
you about its current state.

Regards,
Jonathan

Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[Lars Schneider]

> On 13 Jun 2017, at 23:40, Junio C Hamano <gitster@pobox.com> wrote:
> 
> 
> * ls/github (2017-06-13) 1 commit
> - Configure Git contribution guidelines for github.com
> 
> Help contributors that visit us at GitHub.
> 
> Will merge to 'next'.

I just pushed v3. If possible, please use it for 'next':
http://public-inbox.org/git/20170614073536.45498-1-larsxschneider@gmail.com/


> * ls/filter-process-delayed (2017-06-01) 5 commits
> - convert: add "status=delayed" to filter process protocol
> - convert: move multiple file filter error handling to separate function
> - t0021: write "OUT" only on success
> - t0021: make debug log file name configurable
> - t0021: keep filter log files on comparison
> 
> The filter-process interface learned to allow a process with long
> latency give a "delayed" response.
> 
> Needs review.

I wonder if anyone has a few free cycles to review this:
http://public-inbox.org/git/20170601082203.50397-1-larsxschneider@gmail.com/

My GitLFS users are desperately waiting for this change :-)


Thank you,
Lars

rs/strbuf-addftime-zZ, was Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[Johannes Schindelin]

[-- Attachment #1: Type: text/plain, Size: 2335 bytes --]

Hi Junio,

On Tue, 13 Jun 2017, Junio C Hamano wrote:

> * rs/strbuf-addftime-zZ (2017-06-10) 2 commits
>  - date: use localtime() for "-local" time formats
>  - strbuf: let strbuf_addftime handle %z and %Z itself
> 
>  As there is no portable way to pass timezone information to
>  strftime, some output format from "git log" and friends are
>  impossible to produce.  Teach our own strbuf_addftime to replace %z
>  and %Z with caller-supplied values to help working around this.
> 
>  Will merge to 'next'.

Hold on. Have you tried to build this branch?

-- snip --
    CC date.o
date.c:63:36: error: unknown type name ‘timestamp_t’
 static struct tm *time_to_tm_local(timestamp_t time)
                                    ^
date.c: In function ‘show_date’:
date.c:211:8: error: implicit declaration of function ‘time_to_tm_local’
[-Werror=implicit-function-declaration]
   tm = time_to_tm_local(time);
        ^
date.c:211:6: error: assignment makes pointer from integer without a cast
[-Werror=int-conversion]
   tm = time_to_tm_local(time);
      ^
cc1: all warnings being treated as errors
-- snap --

I would expect this to be rebased *at least* to dddbad728c9 (timestamp_t:
a new data type for timestamps, 2017-04-26).

But even then, it fails in t0006 on Windows with this error:

-- snip --
++ eval 'diff -u "$@" '
+++ diff -u expect actual
--- expect      2017-06-14 10:53:40.126136900 +0000
+++ actual      2017-06-14 10:53:40.171146800 +0000
@@ -1 +1 @@
-1466000000 +0200 -> 2016-06-15 14:13:20 +0000 (UTC)
+1466000000 +0200 -> 2016-06-15 14:13:20 UTC (UTC)
+ test_eval_ret_=1
+ want_trace
+ test t = t
+ test t = t
+ set +x
error: last command exited with $?=1
not ok 23 - show date (format-local:%Y-%m-%d %H:%M:%S %z (%Z):1466000000 +0200)
#
#                       echo "$time -> $expect" >expect &&
#                       (
#                               if test -n "$zone"
#                               then
#                                       TZ=$zone
#                                       export $TZ
#                               fi &&
#                               test-date show:"$format" "$time" >actual
#                       ) &&
#                       test_cmp expect actual
-- snap --

What gives?

Ciao,
Dscho

Re: rs/strbuf-addftime-zZ, was Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[Jeff King]

On Wed, Jun 14, 2017 at 12:57:06PM +0200, Johannes Schindelin wrote:

> Hi Junio,
> 
> On Tue, 13 Jun 2017, Junio C Hamano wrote:
> 
> > * rs/strbuf-addftime-zZ (2017-06-10) 2 commits
> >  - date: use localtime() for "-local" time formats
> >  - strbuf: let strbuf_addftime handle %z and %Z itself
> > 
> >  As there is no portable way to pass timezone information to
> >  strftime, some output format from "git log" and friends are
> >  impossible to produce.  Teach our own strbuf_addftime to replace %z
> >  and %Z with caller-supplied values to help working around this.
> > 
> >  Will merge to 'next'.
> 
> Hold on. Have you tried to build this branch?
> 
> -- snip --
>     CC date.o
> date.c:63:36: error: unknown type name ‘timestamp_t’
>  static struct tm *time_to_tm_local(timestamp_t time)
>                                     ^
> date.c: In function ‘show_date’:
> date.c:211:8: error: implicit declaration of function ‘time_to_tm_local’
> [-Werror=implicit-function-declaration]
>    tm = time_to_tm_local(time);
>         ^
> date.c:211:6: error: assignment makes pointer from integer without a cast
> [-Werror=int-conversion]
>    tm = time_to_tm_local(time);
>       ^
> cc1: all warnings being treated as errors
> -- snap --
> 
> I would expect this to be rebased *at least* to dddbad728c9 (timestamp_t:
> a new data type for timestamps, 2017-04-26).

Yeah, the timestamp_t mentions are from my patch (the top one). I built
it applying René's on the current master and then building on top. I
suspect Junio didn't test it in isolation, but only merged to "pu",
where it would be OK.

> But even then, it fails in t0006 on Windows with this error:
> 
> -- snip --
> ++ eval 'diff -u "$@" '
> +++ diff -u expect actual
> --- expect      2017-06-14 10:53:40.126136900 +0000
> +++ actual      2017-06-14 10:53:40.171146800 +0000
> @@ -1 +1 @@
> -1466000000 +0200 -> 2016-06-15 14:13:20 +0000 (UTC)
> +1466000000 +0200 -> 2016-06-15 14:13:20 UTC (UTC)

Ugh, I was worried about that some systems might display timezones
differently (that's why I _didn't_ check %Z in the EST5 case). But I
must admit this was not an incompatibility I was expecting. It looks
like your system strftime() turns %z into "UTC". POSIX says:

  %z
    Replaced by the offset from UTC in the ISO 8601:2000 standard format
    (+hhmm or -hhmm), or by no characters if no timezone is
    determinable.

So it seems like the mingw strftime is violating POSIX. I don't see an
easy solution beyond marking this as !MINGW. Though if we wanted a
partial test, we could test %z and %Z separately.

-Peff

Re: rs/strbuf-addftime-zZ, was Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hold on. Have you tried to build this branch?
>
> -- snip --
>     CC date.o
> date.c:63:36: error: unknown type name ‘timestamp_t’
>  static struct tm *time_to_tm_local(timestamp_t time)
>                                     ^
> date.c: In function ‘show_date’:
> date.c:211:8: error: implicit declaration of function ‘time_to_tm_local’
> [-Werror=implicit-function-declaration]
>    tm = time_to_tm_local(time);
>         ^
> date.c:211:6: error: assignment makes pointer from integer without a cast
> [-Werror=int-conversion]
>    tm = time_to_tm_local(time);
>       ^
> cc1: all warnings being treated as errors
> -- snap --
>
> I would expect this to be rebased *at least* to dddbad728c9 (timestamp_t:
> a new data type for timestamps, 2017-04-26).

Thanks for noticing.

My preference is to use ulong in the commit at the tip by Peff.  We
can do s/ulong/timestamp_t/ in a merge that merges the topic to
newer integration branches that have the timestamp_t topic merged
(e.g. 'master'), as that allows older integration branches
(e.g. 'maint') to have the %z/%Z fix independently.

It would be another valid approach to fork it at b15667bb ("Merge
branch 'js/larger-timestamps'", 2017-05-16) or a commit that appears
later than that one on 'master', and tweak Peff's commit to use
timestamp_t, if we declare that the %z/%Z fix will only be in 2.14
and later and will never go to 'maint'.

Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[Torsten Bögershausen]

On 14.06.17 09:42, Lars Schneider wrote:

> 
>> * ls/filter-process-delayed (2017-06-01) 5 commits
>> - convert: add "status=delayed" to filter process protocol
>> - convert: move multiple file filter error handling to separate function
>> - t0021: write "OUT" only on success
>> - t0021: make debug log file name configurable
>> - t0021: keep filter log files on comparison
>>
>> The filter-process interface learned to allow a process with long
>> latency give a "delayed" response.
>>
>> Needs review.
> 
> I wonder if anyone has a few free cycles to review this:
> http://public-inbox.org/git/20170601082203.50397-1-larsxschneider@gmail.com/

It's on my todo-list, may be this weekend or so

Re: rs/strbuf-addftime-zZ, was Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[René Scharfe]

Am 14.06.2017 um 13:10 schrieb Jeff King:
> On Wed, Jun 14, 2017 at 12:57:06PM +0200, Johannes Schindelin wrote:
>> But even then, it fails in t0006 on Windows with this error:
>>
>> -- snip --
>> ++ eval 'diff -u "$@" '
>> +++ diff -u expect actual
>> --- expect      2017-06-14 10:53:40.126136900 +0000
>> +++ actual      2017-06-14 10:53:40.171146800 +0000
>> @@ -1 +1 @@
>> -1466000000 +0200 -> 2016-06-15 14:13:20 +0000 (UTC)
>> +1466000000 +0200 -> 2016-06-15 14:13:20 UTC (UTC)
> 
> Ugh, I was worried about that some systems might display timezones
> differently (that's why I _didn't_ check %Z in the EST5 case). But I
> must admit this was not an incompatibility I was expecting. It looks
> like your system strftime() turns %z into "UTC". POSIX says:
> 
>    %z
>      Replaced by the offset from UTC in the ISO 8601:2000 standard format
>      (+hhmm or -hhmm), or by no characters if no timezone is
>      determinable.
> 
> So it seems like the mingw strftime is violating POSIX. I don't see an
> easy solution beyond marking this as !MINGW. Though if we wanted a
> partial test, we could test %z and %Z separately.

Hmm.  The patches currently either let strftime handle both %z and %Z
(in the local case) or handle both internally.  Perhaps we need a third
option, namely to handle %z internally in all cases for systems whose
implementation violates POSIX?  Nah, it would be easier to always handle
%z internally.  Any downsides?  Does someone actually expect %z to show
time zone names instead of offsets on Windows?

René

Re: rs/strbuf-addftime-zZ, was Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[Johannes Schindelin]

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

Hi,

On Wed, 14 Jun 2017, René Scharfe wrote:

> Does someone actually expect %z to show time zone names instead of
> offsets on Windows?

Not me ;-)

I cannot speak for anyone else, as I lack that information, though.

Ciao,
Dscho

Re: rs/strbuf-addftime-zZ, was Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[René Scharfe]

Am 14.06.2017 um 23:04 schrieb Johannes Schindelin:
> On Wed, 14 Jun 2017, René Scharfe wrote:
> 
>> Does someone actually expect %z to show time zone names instead of
>> offsets on Windows?
> 
> Not me ;-)
> 
> I cannot speak for anyone else, as I lack that information, though.

Before the patch %z would always expand to +0000 on Linux and to the
name of the local time zone on Windows, no matter which offset was
actually given.  So it was broken in either case (even though it got
at least some aspects right by accident for some commits).  Based on
that I'd think handling %z internally should be OK.

But there's more.  strftime on Windows doesn't support common POSIX-
defined tokens like %F (%Y-%m-%d) and %T (%H:%M:%S). We could handle
them as well.  Do we want that?  At least we'd have to update the
added test that uses them..

Here's the full list of tokens in POSIX [1], but not supported by
Windows [2]: %C, %D, %F, %G, %R, %T, %V, %e, %g, %h, %n, %r, %t, %u
plus the modifiers %E and %O.

René


[1] http://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html
[2] https://msdn.microsoft.com/en-us/library/fe06s4ak.aspx

Re: rs/strbuf-addftime-zZ, was Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[Jeff King]

On Thu, Jun 15, 2017 at 01:03:29AM +0200, René Scharfe wrote:

> Am 14.06.2017 um 23:04 schrieb Johannes Schindelin:
> > On Wed, 14 Jun 2017, René Scharfe wrote:
> > 
> >> Does someone actually expect %z to show time zone names instead of
> >> offsets on Windows?
> > 
> > Not me ;-)
> > 
> > I cannot speak for anyone else, as I lack that information, though.
> 
> Before the patch %z would always expand to +0000 on Linux and to the
> name of the local time zone on Windows, no matter which offset was
> actually given.  So it was broken in either case (even though it got
> at least some aspects right by accident for some commits).  Based on
> that I'd think handling %z internally should be OK.

I agree.

> But there's more.  strftime on Windows doesn't support common POSIX-
> defined tokens like %F (%Y-%m-%d) and %T (%H:%M:%S). We could handle
> them as well.  Do we want that?  At least we'd have to update the
> added test that uses them..
> 
> Here's the full list of tokens in POSIX [1], but not supported by
> Windows [2]: %C, %D, %F, %G, %R, %T, %V, %e, %g, %h, %n, %r, %t, %u
> plus the modifiers %E and %O.

I don't have a real opinion on that. The point of adding strftime was
always to give the user access to whatever their system supports. In
particular "%c" which we cannot emulate ourselves.

If people want support for those other things on platforms that don't
have it, I have no real objection. But I also don't know that it's worth
spending time on if nobody is asking for it.

-Peff

Re: rs/strbuf-addftime-zZ, was Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[René Scharfe]

Am 15.06.2017 um 07:42 schrieb Jeff King:
> On Thu, Jun 15, 2017 at 01:03:29AM +0200, René Scharfe wrote:
>> But there's more.  strftime on Windows doesn't support common POSIX-
>> defined tokens like %F (%Y-%m-%d) and %T (%H:%M:%S). We could handle
>> them as well.  Do we want that?  At least we'd have to update the
>> added test that uses them..
>>
>> Here's the full list of tokens in POSIX [1], but not supported by
>> Windows [2]: %C, %D, %F, %G, %R, %T, %V, %e, %g, %h, %n, %r, %t, %u
>> plus the modifiers %E and %O.
> 
> I don't have a real opinion on that. The point of adding strftime was
> always to give the user access to whatever their system supports. In
> particular "%c" which we cannot emulate ourselves.
> 
> If people want support for those other things on platforms that don't
> have it, I have no real objection. But I also don't know that it's worth
> spending time on if nobody is asking for it.

Agreed; let's make the tests more focused (i.e. not exercise %F and %T
needlessly).

René

Re: What's cooking in git.git (Jun 2017, #04; Tue, 13)

[Junio C Hamano]

Jonathan Nieder <jrnieder@gmail.com> writes:

>>  It is not known if a simple "yes/no" is sufficient in the longer
>>  term, and what should happen when --recurse-submodules option starts
>>  taking "recurse into them how?" parameter, though.
>
> Any pointers for where this has been discussed, if anywhere (e.g. was

If this were discussed, then the answer to the question we may know
by now ;-)  I do not think anybody gave a serious thought to convince
the public why a boolean is enough, hence this comment.

>> * bw/config-h (2017-06-13) 4 commits
>>  - config: don't implicitly use gitdir
>>  - config: don't include config.h by default
>>  - config: remove git_config_iter
>>  - config: create config.h
>>
>>  Code clean-up.
>
> Patches 1-3 are good to go IMHO.
>
> Patch 4 in pu is marked with my Reviewed-by.  I think it's getting
> there but not there yet.  Did some script pull the tag from my reply
> to the cover letter?

No, nothing that elaborate.  

I go through each message in Gnus newsreader and feed the article to
a shell command, e.g. "Meta/add-by -r jrnieder@ | git am -s3c".  The
UI remembers the last command I used when I choose to feed the next
article to a shell command, and after running it to first three, I
forgot to remove the 'add-by' bit from the command line for the fourth
one.