git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Freese <ericdfreese@gmail.com>
To: git@vger.kernel.org
Cc: Eric Freese <ericdfreese@gmail.com>
Subject: [RFC PATCH 1/1] for-each-ref: do not output empty lines
Date: Mon,  9 Sep 2019 23:17:05 -0600	[thread overview]
Message-ID: <20190910051705.2765-2-ericdfreese@gmail.com> (raw)
In-Reply-To: <20190910051705.2765-1-ericdfreese@gmail.com>

If the format string expands to an empty string for a given ref, do not
print the empty line.

This is helpful when wanting to print only certain kinds of refs that
you can't already filter for.

For example, to exclude symbolic refs, use format string:
  "%(if)%(symref)%(then)%(else)%(refname)%(end)"

Or to include only symbolic refs, use:
  "%(if)%(symref)%(then)%(refname)%(end)"

Signed-off-by: Eric Freese <ericdfreese@gmail.com>
---
 ref-filter.c            | 3 ++-
 t/t6300-for-each-ref.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ref-filter.c b/ref-filter.c
index 7338cfc671..b5b3c4ddf6 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -2395,9 +2395,10 @@ void show_ref_array_item(struct ref_array_item *info,
 	if (format_ref_array_item(info, format, &final_buf, &error_buf))
 		die("%s", error_buf.buf);
 	fwrite(final_buf.buf, 1, final_buf.len, stdout);
+	if (final_buf.len)
+		putchar('\n');
 	strbuf_release(&error_buf);
 	strbuf_release(&final_buf);
-	putchar('\n');
 }
 
 void pretty_print_ref(const char *name, const struct object_id *oid,
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 9c910ce746..1f070e63e2 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -42,7 +42,7 @@ test_atom() {
 		 sym) ref=refs/heads/sym ;;
 		   *) ref=$1 ;;
 	esac
-	printf '%s\n' "$3" >expected
+	{ test -n "$3" && printf '%s\n' "$3"; } >expected
 	test_expect_${4:-success} $PREREQ "basic atom: $1 $2" "
 		git for-each-ref --format='%($2)' $ref >actual &&
 		sanitize_pgp <actual >actual.clean &&
@@ -313,7 +313,7 @@ test_expect_success 'Check format of strftime-local date fields' '
 '
 
 test_expect_success 'exercise strftime with odd fields' '
-	echo >expected &&
+	>expected &&
 	git for-each-ref --format="%(authordate:format:)" refs/heads >actual &&
 	test_cmp expected actual &&
 	long="long format -- $ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID" &&
-- 
2.23.0


  reply	other threads:[~2019-09-10  5:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-10  5:17 [RFC PATCH 0/1] for-each-ref: do not output empty lines Eric Freese
2019-09-10  5:17 ` Eric Freese [this message]
2019-09-10  6:02   ` [RFC PATCH 1/1] " Junio C Hamano
2019-09-10  6:14     ` Junio C Hamano
2019-09-10 16:35     ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190910051705.2765-2-ericdfreese@gmail.com \
    --to=ericdfreese@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).