status: print stash info with --porcelain=v2 --show-stash

The v2 porcelain format is very convenient for obtaining a lot of
information about the current state of the repo, but does not contain
any info about the stash. git status already accepts --show-stash but
it's silently ignored when --porcelain=v2 is given.

Let's add a simple line to print the number of stash entries but in a
format similar in style to the rest of the format.

Signed-off-by: Øystein Walle <oystwa@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
pull/1061/head
Øystein Walle 11 months ago committed by Junio C Hamano
parent 612942a1d2
commit 2e59e78096
  1. 8
      Documentation/git-status.txt
  2. 15
      t/t7064-wtstatus-pv2.sh
  3. 15
      wt-status.c

@ -314,6 +314,14 @@ Line Notes
------------------------------------------------------------
....
Stash Information
^^^^^^^^^^^^^^^^^
If `--show-stash` is given, one line is printed showing the number of stash
entries if non-zero:
# stash <N>
Changed Tracked Entries
^^^^^^^^^^^^^^^^^^^^^^^

@ -113,6 +113,21 @@ test_expect_success 'after first commit, create unstaged changes' '
test_cmp expect actual
'
test_expect_success 'after first commit, stash existing changes' '
cat >expect <<-EOF &&
# branch.oid $H0
# branch.head initial-branch
# stash 2
EOF
test_when_finished "git stash pop && git stash pop" &&
git stash -- file_x &&
git stash &&
git status --porcelain=v2 --branch --show-stash --untracked-files=no >actual &&
test_cmp expect actual
'
test_expect_success 'after first commit but omit untracked files and branch' '
cat >expect <<-EOF &&
1 .M N... 100644 100644 100644 $OID_X $OID_X file_x

@ -2182,6 +2182,18 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s)
}
}
/*
* Print the stash count in a porcelain-friendly format
*/
static void wt_porcelain_v2_print_stash(struct wt_status *s)
{
int stash_count = count_stash_entries();
char eol = s->null_termination ? '\0' : '\n';
if (stash_count > 0)
fprintf(s->fp, "# stash %d%c", stash_count, eol);
}
/*
* Convert various submodule status values into a
* fixed-length string of characters in the buffer provided.
@ -2443,6 +2455,9 @@ static void wt_porcelain_v2_print(struct wt_status *s)
if (s->show_branch)
wt_porcelain_v2_print_tracking(s);
if (s->show_stash)
wt_porcelain_v2_print_stash(s);
for (i = 0; i < s->change.nr; i++) {
it = &(s->change.items[i]);
d = it->util;

Loading…
Cancel
Save