Re: What's cooking in git.git (Oct 2009, #02; Sun, 11)

From: Jens Lehmann <jens.lehmann@web.de>
Date: Oct 14, 2009, 18:29 UTC
Message-ID: <4AD61880.4040600@web.de>
In-Reply-To: <7vfx9pmhae.fsf@alter.siamese.dyndns.org>

Junio C Hamano schrieb:

Show 5 quoted lines

> * js/diff-verbose-submodule (2009-10-04) 1 commit.
>  - Add the --submodule-summary option to the diff option family
> 
> Dscho sounded like he has some corrections after list comments, but I did
> not pick up his interdiff in the middle.

Dscho condensed his initial patch with the interdiff you mentioned, additionally silenced a compiler warning and activated --first-parent. This follows as patch 1/4. Patches 2/4 to 4/4 contain my two bugfixes and the testcase i copied from submodule summary while adapting it to the changes of the output format.

The remaining differences from the output shown by submodule summary are:

1) git diff shows only two dots for a fast forward (submodule summary
   always shows three)
2) git diff shows "Submodule" instead of a single '*' in the first line
3) git diff doesn't add a newline after each shortlog
4) submodule summary prints out the number of shortlog entries, this
   version does not
5) submodule summary can limit the number of shortlog lines, git diff
   can't do that right now
6) When files are replaced by a submodules or vice versa, git diff
   generates an extra hunk for the deleted/added file and one saying
   "(new submodule)"/"(submodule deleted)"

> The output format needs to be described better here and also in
> Documentation/diff-format.txt.

Will do when it is clear which of the 6 differences should be fixed and which can stay.

Jens Lehmann (3):
  fix indentation depth for git diff --submodule-summary
  fix output for deleted submodules in git diff --submodule-summary
  add tests for git diff --submodule-summary

Johannes Schindelin (1):
  Add the --submodule-summary option to the diff option family

 Documentation/diff-options.txt    |    4 +
 Makefile                          |    2 +
 diff.c                            |   14 +++
 diff.h                            |    3 +
 submodule.c                       |  113 ++++++++++++++++++++
 submodule.h                       |    8 ++
 t/t4041-diff-submodule-summary.sh |  206 +++++++++++++++++++++++++++++++++++++
 7 files changed, 350 insertions(+), 0 deletions(-)
 create mode 100644 submodule.c
 create mode 100644 submodule.h
 create mode 100755 t/t4041-diff-submodule-summary.sh