for-each-ref: Field with abbreviated objectname

Michael J Gruber · gitster · commit 67687feae52f · 2010-05-18T21:49:04.000-07:00
Introduce a :short modifier to objectname which outputs the abbreviated
object name.

Signed-off-by: Michael J Gruber &lt;git@drmicha.warpmail.net&gt;
Reviewed-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
@@ -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)"
 '

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,9 @@ static void grab_common_values(struct atom_value *val, int deref, struct object`
`227`	`227`	`strcpy(s, sha1_to_hex(obj->sha1));`
`228`	`228`	`v->s = s;`
`229`	`229`	`}`
	`230`	`+ else if (!strcmp(name, "objectname:short")) {`
	`231`	`+ v->s = find_unique_abbrev(obj->sha1, DEFAULT_ABBREV);`
	`232`	`+ }`
`230`	`233`	`}`
`231`	`234`	`}`
`232`	`235`