diff options
| author | Pieter de Bie <pdebie@ai.rug.nl> | 2008-07-31 15:20:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-02 11:07:50 -0700 |
| commit | b003c00b7b5e352569061fec0b1e1bd0d0fa8b6a (patch) | |
| tree | a9010bba1851438980c6a10efba4000fc4cd3f3e | |
| parent | e8b55fab6237b30494aa1905c3209d5bf5494a29 (diff) | |
| download | git-b003c00b7b5e352569061fec0b1e1bd0d0fa8b6a.tar.gz | |
git-name-rev: allow --name-only in combination with --stdin
Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-name-rev.txt | 3 | ||||
| -rw-r--r-- | builtin-name-rev.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt index ffac3f8f56..83d8e4a9fc 100644 --- a/Documentation/git-name-rev.txt +++ b/Documentation/git-name-rev.txt @@ -38,8 +38,7 @@ OPTIONS Instead of printing both the SHA-1 and the name, print only the name. If given with --tags the usual tag prefix of "tags/" is also omitted from the name, matching the output - of linkgit:git-describe[1] more closely. This option - cannot be combined with --stdin. + of linkgit:git-describe[1] more closely. --no-undefined:: Die with error code != 0 when a reference is undefined, diff --git a/builtin-name-rev.c b/builtin-name-rev.c index b75c73b224..ff7d638dc2 100644 --- a/builtin-name-rev.c +++ b/builtin-name-rev.c @@ -204,8 +204,13 @@ static void name_rev_line(char *p, struct name_ref_data *data) if (!name) continue; - fwrite(p_start, p - p_start + 1, 1, stdout); - printf(" (%s)", name); + if (data->name_only) { + fwrite(p_start, p - p_start + 1 - 40, 1, stdout); + printf(name); + } else { + fwrite(p_start, p - p_start + 1, 1, stdout); + printf(" (%s)", name); + } p_start = p + 1; } } |