diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2010-05-13 16:31:46 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-19 08:49:04 +0400 |
| commit | 67687feae52ff2d3ab7edf3ac42a39c5e44be299 (patch) | |
| tree | ba6200d9cbf29a9c1acaa17bfaa4a782d531b249 | |
| parent | 04794fdc2701f15d79d92805cfe94c9e754e2e05 (diff) | |
for-each-ref: Field with abbreviated objectname
Introduce a :short modifier to objectname which outputs the abbreviated
object name.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-for-each-ref.txt | 1 | ||||
| -rw-r--r-- | builtin/for-each-ref.c | 3 | ||||
| -rwxr-xr-x | t/t6300-for-each-ref.sh | 9 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 7e83288d18..390d85ccae 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -86,6 +86,7 @@ objectsize:: objectname:: The object name (aka SHA-1). + For a non-ambiguous abbreviation of the object name append `:short`. upstream:: The name of a local ref which can be considered ``upstream'' diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 62be1bbfd6..3a97953177 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -227,6 +227,9 @@ static void grab_common_values(struct atom_value *val, int deref, struct object strcpy(s, sha1_to_hex(obj->sha1)); v->s = s; } + else if (!strcmp(name, "objectname:short")) { + v->s = find_unique_abbrev(obj->sha1, DEFAULT_ABBREV); + } } } diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 8052c86ad3..7dc8a510c7 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -295,6 +295,15 @@ test_expect_success 'Check short upstream format' ' test_cmp expected actual ' +cat >expected <<EOF +67a36f1 +EOF + +test_expect_success 'Check short objectname format' ' + git for-each-ref --format="%(objectname:short)" refs/heads >actual && + test_cmp expected actual +' + test_expect_success 'Check for invalid refname format' ' test_must_fail git for-each-ref --format="%(refname:INVALID)" ' |