git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Johannes Sixt <j.sixt@viscovery.net>
Subject: [PATCH 3/5] rev-list --exclude: tests
Date: Fri,  1 Nov 2013 12:34:13 -0700	[thread overview]
Message-ID: <1383334455-18623-2-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1383334455-18623-1-git-send-email-gitster@pobox.com>

Add tests for the --exclude=<glob> feature.

A few tests are added for cases where use of globbing and
"--exclude" results in no positive revisions:

 * "--exclude=<glob>" before "--all" etc. resulted in no results;

 * "--stdin" is used but no input was given;

 * "--all" etc. is used but no matching refs are found.

Currently, we fail such a request with the same error message we
would give to a command line that does not specify any positive
revision (e.g. "git rev-list<ENTER>").

We may want to treat these cases differently and not error out, but
the logic to detect that would be common to all of them, so I'd
leave it outside this topic for now, and stop at adding these tests
as food-for-thought.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t6018-rev-list-glob.sh | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index f00cebf..77ef323 100755
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -231,6 +231,48 @@ test_expect_success 'rev-list --remotes=foo' '
 
 '
 
+test_expect_success 'rev-list --exclude with --branches' '
+	compare rev-list "--exclude=*/* --branches" "master someref subspace-x"
+'
+
+test_expect_success 'rev-list --exclude with --all' '
+	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
+'
+
+test_expect_success 'rev-list accumulates multiple --exclude' '
+	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
+'
+
+
+# "git rev-list<ENTER>" is likely to be a bug in the calling script and may
+# deserve an error message, but do cases where set of refs programatically
+# given using globbing and/or --stdin need to fail with the same error, or
+# are we better off reporting a success with no output?  The following few
+# tests document the current behaviour to remind us that we might want to
+# think about this issue.
+
+test_expect_failure 'rev-list may want to succeed with empty output on no input (1)' '
+	>expect &&
+	git rev-list --stdin <expect >actual &&
+	test_cmp expect actual
+'
+
+test_expect_failure 'rev-list may want to succeed with empty output on no input (2)' '
+	>expect &&
+	git rev-list --exclude=* --all >actual &&
+	test_cmp expect actual
+'
+
+test_expect_failure 'rev-list may want to succeed with empty output on no input (3)' '
+	(
+		test_create_repo empty &&
+		cd empty &&
+		>expect &&
+		git rev-list --all >actual &&
+		test_cmp expect actual
+	)
+'
+
 test_expect_success 'shortlog accepts --glob/--tags/--remotes' '
 
 	compare shortlog "subspace/one subspace/two" --branches=subspace &&
-- 
1.8.5-rc0-281-g8951339

  reply	other threads:[~2013-11-01 19:34 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-30  5:00 [PATCH] revision: add --except option Felipe Contreras
2013-08-30  5:40 ` Felipe Contreras
2013-08-30  6:32 ` Junio C Hamano
2013-08-30  7:17   ` Felipe Contreras
     [not found]     ` <CAPc5daVSqoE74kmsobg7RpMtiL3vzKN+ckAcWEKU_Q_wF8HYuA@mail.gmail.com>
2013-08-30  7:32       ` Felipe Contreras
2013-08-30  9:08         ` Johannes Sixt
2013-08-30 16:48         ` Junio C Hamano
2013-08-30 18:37           ` Felipe Contreras
2013-08-30 23:55           ` [PATCH] revision: introduce --exclude=<glob> to tame wildcards Junio C Hamano
2013-08-31  0:22             ` Duy Nguyen
2013-08-31  0:29               ` Junio C Hamano
2013-08-31 19:33             ` Felipe Contreras
2013-09-03 15:45               ` Junio C Hamano
2013-09-03 22:03                 ` Felipe Contreras
2013-09-02 20:11             ` Johannes Sixt
2013-09-02 23:09               ` Felipe Contreras
2013-09-03  4:05               ` Michael Haggerty
2013-09-03 16:03               ` Junio C Hamano
2013-09-03 20:02                 ` Johannes Sixt
2013-11-01 19:34                   ` [PATCH 0/5] ref glob exclusion follow-up Junio C Hamano
2013-11-01 19:34                     ` Junio C Hamano [this message]
2013-11-01 19:34                     ` [PATCH 4/5] rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API Junio C Hamano
2013-11-01 19:34                     ` [PATCH 5/5] rev-parse: introduce --exclude=<glob> to tame wildcards Junio C Hamano
2013-11-01 19:43                       ` Eric Sunshine
2013-11-01 20:01                         ` Junio C Hamano
2013-11-01 21:08                     ` [PATCH 0/5] ref glob exclusion follow-up Johannes Sixt
2013-08-30  7:56   ` [PATCH] revision: add --except option Johannes Sixt
2013-08-31 19:27     ` Felipe Contreras
2013-09-02  6:25       ` Johannes Sixt
2013-09-02  6:48         ` Felipe Contreras
2013-08-30  7:11 ` Johannes Sixt
2013-08-30  7:24   ` Felipe Contreras

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

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

  git send-email \
    --in-reply-to=1383334455-18623-2-git-send-email-gitster@pobox.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=j.sixt@viscovery.net \
    /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.
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 NNTP newsgroup(s).