On Mon, May 29, 2017 at 11:32:50AM -0400, Jeff King wrote: > I'll try to put together patches in the next day or so. Comments welcome > in the meantime. So here they are. For those just joining us, the immediate problem is that "git am -h" is broken (whether you're in a repo or not). That's fixed by the first patch, which can go to "maint" separately (although the rest are pretty unadventurous). The rest of it cleans up "-h" handling for a variety of builtin commands, and then adds a test to make sure they all behave sanely (which unsurprisingly is how I found all the problems fixed by the earlier patches). [1/8]: am: handle "-h" argument earlier [2/8]: credential: handle invalid arguments earlier [3/8]: upload-archive: handle "-h" option early [4/8]: remote-{ext,fd}: print usage message on invalid arguments [5/8]: submodule--helper: show usage for "-h" [6/8]: version: convert to parse-options [7/8]: git: add hidden --list-builtins option [8/8]: t0012: test "-h" with builtins builtin/am.c | 3 +++ builtin/credential.c | 4 ++-- builtin/remote-ext.c | 5 ++++- builtin/remote-fd.c | 5 ++++- builtin/submodule--helper.c | 5 ++--- builtin/upload-archive.c | 5 ++++- git.c | 12 ++++++++++++ help.c | 25 ++++++++++++++++++++----- t/t0012-help.sh | 12 ++++++++++++ 9 files changed, 63 insertions(+), 13 deletions(-) -Peff