From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Teemu Likonen <tlikonen@iki.fi>,
Daniel Barkalow <barkalow@iabervon.org>,
git@vger.kernel.org
Subject: Re: Friendly refspecs
Date: Wed, 23 Apr 2008 05:21:45 -0400 [thread overview]
Message-ID: <20080423092144.GA11368@sigill.intra.peff.net> (raw)
In-Reply-To: <20080423091606.GC11935@sigill.intra.peff.net>
On Wed, Apr 23, 2008 at 05:16:06AM -0400, Jeff King wrote:
> > Historically we did not favor one way or another for the general purpose
> > syntax. I think Jeff's proposed heuristics to favor branch if a branch
> > tip is pushed and tag if a tag is pushed makes sense.
>
> OK, here is a cleaned up patch with tests.
Oops, I forgot to mention: there is a broken test in t5516 that is
revealed by this change. The patch below should be applied before the
DWIM one.
-- >8 --
t5516: remove ambiguity test (1)
This test tried to push into a remote with ambiguous refs in
remotes/$x/master and remotes/$y/master. However, the remote
never actually tells us about the refs/remotes hierarchy, so
we don't even see this ambiguity.
The test happened to pass because we were simply looking for
failure, and the test fails for another reason: the dst
refspec does not exist and does not begin with refs/, making
it invalid.
Signed-off-by: Jeff King <peff@peff.net>
---
t/t5516-fetch-push.sh | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 6d7e738..f93a100 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -209,19 +209,7 @@ test_expect_success 'push with weak ambiguity (2)' '
'
-test_expect_success 'push with ambiguity (1)' '
-
- mk_test remotes/origin/master remotes/frotz/master &&
- if git push testrepo master:master
- then
- echo "Oops, should have failed"
- false
- else
- check_push_result $the_first_commit remotes/origin/master remotes/frotz/master
- fi
-'
-
-test_expect_success 'push with ambiguity (2)' '
+test_expect_success 'push with ambiguity' '
mk_test heads/frotz tags/frotz &&
if git push testrepo master:frotz
--
1.5.5.1.69.g9c889.dirty
next prev parent reply other threads:[~2008-04-23 9:22 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-09 10:14 git annoyances Ingo Molnar
2008-04-09 10:41 ` Björn Steinbrink
2008-04-09 14:57 ` Jeff King
2008-04-09 15:15 ` [PATCH] git-remote: show all remotes with "git remote show" Jeff King
2008-04-09 16:54 ` Johannes Schindelin
2008-04-10 10:56 ` Junio C Hamano
2008-04-09 20:07 ` Ingo Molnar
2008-04-10 19:59 ` Ingo Molnar
2008-04-09 17:08 ` git annoyances Avery Pennarun
2008-04-10 8:41 ` Karl Hasselström
2008-04-10 15:05 ` Avery Pennarun
2008-04-11 7:00 ` Karl Hasselström
2008-04-09 20:08 ` Friendly refspecs (Was: Re: git annoyances) Teemu Likonen
2008-04-09 20:32 ` Avery Pennarun
2008-04-09 20:34 ` Jeff King
2008-04-09 22:25 ` Teemu Likonen
2008-04-09 22:51 ` Jeff King
2008-04-10 0:03 ` Jeff King
2008-04-10 0:11 ` Jeff King
2008-04-10 7:51 ` Friendly refspecs Junio C Hamano
2008-04-10 8:03 ` Jeff King
[not found] ` <bd6139dc0804091616k53f4e0c1sf75aa9585c5a54c5@mail.gmail.com>
2008-04-10 0:33 ` Friendly refspecs (Was: Re: git annoyances) Jeff King
2008-04-10 7:58 ` Sverre Rabbelier
2008-04-13 9:31 ` Friendly refspecs Teemu Likonen
2008-04-13 9:34 ` [PATCH] Add examples section to 'git fetch' manual Teemu Likonen
2008-04-13 18:56 ` Junio C Hamano
2008-04-13 19:48 ` Matt Graham
2008-04-13 20:05 ` Teemu Likonen
2008-04-14 1:02 ` Junio C Hamano
2008-04-16 3:48 ` Friendly refspecs Jeff King
2008-04-16 4:25 ` Jeff King
2008-04-16 4:41 ` Junio C Hamano
2008-04-16 4:47 ` Jeff King
2008-04-16 15:42 ` Daniel Barkalow
2008-04-16 20:03 ` Junio C Hamano
2008-04-22 10:56 ` Jeff King
2008-04-22 16:52 ` Junio C Hamano
2008-04-22 17:19 ` Daniel Barkalow
2008-04-22 20:12 ` Jeff King
2008-04-22 20:05 ` Jeff King
2008-04-22 20:45 ` Junio C Hamano
2008-04-22 21:52 ` Jeff King
2008-04-23 4:24 ` Teemu Likonen
2008-04-23 5:52 ` Junio C Hamano
2008-04-23 6:24 ` Andreas Ericsson
2008-04-23 9:16 ` Jeff King
2008-04-23 9:21 ` Jeff King [this message]
2008-04-23 11:15 ` Teemu Likonen
2008-04-09 21:21 ` Junio C Hamano
2008-04-10 7:38 ` Teemu Likonen
2008-04-12 18:59 ` git annoyances Santiago Gala
2008-04-09 19:21 ` Daniel Barkalow
2008-04-09 20:41 ` Ingo Molnar
2008-04-10 14:08 ` Daniel Barkalow
2008-04-09 21:04 ` Junio C Hamano
2008-04-09 21:39 ` Jon Loeliger
2008-04-09 23:45 ` Nicolas Pitre
2008-04-09 21:45 ` Jeff King
2008-04-09 23:56 ` André Goddard Rosa
2008-04-10 19:45 ` Govind Salinas
2008-04-10 6:08 ` Jean-Christian de Rivaz
2008-04-10 8:19 ` Sverre Rabbelier
2008-04-10 11:47 ` git-bisect annoyances Ingo Molnar
2008-04-11 5:41 ` Christian Couder
2008-04-11 11:41 ` Ingo Molnar
2008-04-12 6:56 ` Christian Couder
2008-04-11 5:56 ` Junio C Hamano
2008-04-10 23:25 ` [PATCH] When a remote is added but not fetched, tell the user Gabriel
2008-04-11 15:21 ` Johannes Schindelin
2008-04-11 18:35 ` Gabriel
2008-04-11 18:39 ` [PATCH] Default to fetching a remote after adding it Gabriel
2008-04-11 19:17 ` Stephen Sinclair
2008-04-12 14:33 ` Johannes Schindelin
2008-04-12 15:13 ` Gabriel
2008-04-12 15:24 ` Johannes Schindelin
2008-04-11 19:08 ` [PATCH] When a remote is added but not fetched, tell the user Teemu Likonen
2008-04-11 21:39 ` Junio C Hamano
2008-04-11 22:35 ` Sverre Rabbelier
2008-04-11 23:15 ` Junio C Hamano
2008-04-11 23:20 ` Sverre Rabbelier
2008-04-15 3:15 ` Miles Bader
2008-04-11 19:29 ` [PATCH] Default to fetching a remote after adding it Gabriel
2008-04-11 19:36 ` Wincent Colaiuta
2008-04-11 19:46 ` Gabriel
2008-04-11 10:15 ` git annoyances Luciano Rocha
2008-04-11 10:27 ` Wincent Colaiuta
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=20080423092144.GA11368@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tlikonen@iki.fi \
/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).