tree d886e03a2f5acab43e1425c91c7aaa6aa8268c49
parent 584f8975d2d9530a34bd0b936ae774f82fe30fed
parent 40069d6e3a195c8c2414ea60ed75b84ae47f88a1
author Junio C Hamano <gitster@pobox.com> 1492663032 -0700
committer Junio C Hamano <gitster@pobox.com> 1492663032 -0700

Merge branch 'sb/submodule-short-status'

The output from "git status --short" has been extended to show
various kinds of dirtyness in submodules differently; instead of to
"M" for modified, 'm' and '?' can be shown to signal changes only
to the working tree of the submodule but not the commit that is
checked out.

* sb/submodule-short-status:
  submodule.c: correctly handle nested submodules in is_submodule_modified
  short status: improve reporting for submodule changes
  submodule.c: stricter checking for submodules in is_submodule_modified
  submodule.c: port is_submodule_modified to use porcelain 2
  submodule.c: convert is_submodule_modified to use strbuf_getwholeline
  submodule.c: factor out early loop termination in is_submodule_modified
  submodule.c: use argv_array in is_submodule_modified