Teach show_object_with_name() to avoid writing a space before a name
which is empty. Also teach tests for rev-list --objects --filter to not
require a space between the object ID and name.
show_object_with_name() inserts a space between an object's OID and name
regardless of whether the name is empty or not. This causes 'git
cat-file (--batch | --batch-check)' to fail to discover the type of root
directories:
git rev-list --objects --filter=tree:1 --max-count=1 HEAD \
| git cat-file --batch-check
git rev-parse HEAD: | xargs -I% git cat-file -t %
git rev-list --objects --filter=tree:1 --max-count=1 HEAD \
| xargs -I% echo "AA%AA"
git rev-list --objects --filter=tree:1 --max-count=1 HEAD \
| cut -f 1 -d ' ' | git cat-file --batch-check
The extra space provided by 'show_object_with_name()' sticks to the
output of 'git rev-list' even if it's piped into a file.
Signed-off-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
---
I don't see any reason _not_ to remove this stray whitespace at the end,
since it seems like it just gets in the way of easy scripting. I also
think this case will only present itself for root trees.
Not sure if making the whitespace optional is the right solution for the
test, although I couldn't come up with a cleaner approach. Maybe
something like this would be better, even though handling it in the
regex is shorter?
if [[ -z "$name" ]] then
grep "^$hash" actual
else
grep "^$hash $name" actual
fi
- Emily
revision.c | 3 ++-
t/t6112-rev-list-filters-objects.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/revision.c b/revision.c
index d4aaf0ef25..260258b371 100644
--- a/revision.c
+++ b/revision.c
@@ -40,7 +40,8 @@ void show_object_with_name(FILE *out, struct object *obj, const char *name)
{
const char *p;
- fprintf(out, "%s ", oid_to_hex(&obj->oid));
+ fprintf(out, "%s%s", oid_to_hex(&obj->oid),
+ strcmp(name, "") == 0 ? "" : " ");
for (p = name; *p && *p != '\n'; p++)
fputc(*p, out);
fputc('\n', out);
diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
index acd7f5ab80..e05faa7a67 100755
--- a/t/t6112-rev-list-filters-objects.sh
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -288,7 +288,7 @@ expect_has () {
name=$2 &&
hash=$(git -C r3 rev-parse $commit:$name) &&
- grep "^$hash $name$" actual
+ grep "^$hash \?$name$" actual
}
test_expect_success 'verify tree:1 includes root trees' '
--
2.22.0.rc2.383.gf4fbbf30c2-goog
