diff options
| author | Jeff King <peff@peff.net> | 2008-11-12 11:23:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-13 00:55:17 +0300 |
| commit | 1324fb6f161ee516eb4c597880847003a42c0c5d (patch) | |
| tree | 1fcaa3fc04ae1b898eefeb78075e6b1aefdcc6c0 /wt-status.c | |
| parent | 4deca329f5da1552c8d087975dd5107519cabef7 (diff) | |
status: show "-v" diff even for initial commit
Since we can use the same "diff against empty tree" trick as
we do for the non-initial case, it is trivial to make this
work.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index cb1fc48079..ec91fba601 100644 --- a/wt-status.c +++ b/wt-status.c @@ -279,7 +279,8 @@ static void wt_status_print_verbose(struct wt_status *s) struct rev_info rev; init_revisions(&rev, NULL); - setup_revisions(0, NULL, &rev, s->reference); + setup_revisions(0, NULL, &rev, + s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference); rev.diffopt.output_format |= DIFF_FORMAT_PATCH; rev.diffopt.detect_rename = 1; rev.diffopt.file = s->fp; @@ -343,7 +344,7 @@ void wt_status_print(struct wt_status *s) else if (s->commitable) fprintf(s->fp, "# Untracked files not listed (use -u option to show untracked files)\n"); - if (s->verbose && !s->is_initial) + if (s->verbose) wt_status_print_verbose(s); if (!s->commitable) { if (s->amend) |