From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Subject: [PATCH 2/4] t5510: add tests for fetch --prune Date: Sat, 8 Oct 2011 00:51:07 +0200 Message-ID: <1318027869-4037-3-git-send-email-cmn@elego.de> References: <1318027869-4037-1-git-send-email-cmn@elego.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Jeff King , Junio C Hamano , mathstuf@gmail.com To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Oct 08 00:51:20 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RCJGA-000304-9o for gcvg-git-2@lo.gmane.org; Sat, 08 Oct 2011 00:51:18 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759158Ab1JGWvN convert rfc822-to-quoted-printable (ORCPT ); Fri, 7 Oct 2011 18:51:13 -0400 Received: from kimmy.cmartin.tk ([91.121.65.165]:53026 "EHLO kimmy.cmartin.tk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754755Ab1JGWvL (ORCPT ); Fri, 7 Oct 2011 18:51:11 -0400 Received: from centaur.lab.cmartin.tk (brln-4dbc5717.pool.mediaWays.net [77.188.87.23]) by kimmy.cmartin.tk (Postfix) with ESMTPA id 1198446185; Sat, 8 Oct 2011 00:50:46 +0200 (CEST) Received: (nullmailer pid 4081 invoked by uid 1000); Fri, 07 Oct 2011 22:51:09 -0000 X-Mailer: git-send-email 1.7.5.2.354.g349bf In-Reply-To: <1318027869-4037-1-git-send-email-cmn@elego.de> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The failures will be fixed in later commits. Signed-off-by: Carlos Mart=C3=ADn Nieto --- t/t5510-fetch.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 7e433b1..8b5e925 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -76,6 +76,56 @@ test_expect_success "fetch test for-merge" ' cut -f -2 .git/FETCH_HEAD >actual && test_cmp expected actual' =20 +test_expect_success 'fetch --prune on its own works as expected' ' + cd "$D" && + git clone . prune && + cd prune && + git fetch origin refs/heads/master:refs/remotes/origin/extrabranch && + + git fetch --prune origin && + test_must_fail git rev-parse origin/extrabranch +' + +test_expect_failure 'fetch --prune with a branch name keeps branches' = ' + cd "$D" && + git clone . prune-branch && + cd prune-branch && + git fetch origin refs/heads/master:refs/remotes/origin/extrabranch && + + git fetch --prune origin master && + git rev-parse origin/extrabranch +' + +test_expect_failure 'fetch --prune with a namespace keeps other namesp= aces' ' + cd "$D" && + git clone . prune-namespace && + cd prune-namespace && + + git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* && + git rev-parse origin/master +' + +test_expect_failure 'fetch --prune --tags does not delete the remote-t= racking branches' ' + cd "$D" && + git clone . prune-tags && + cd prune-tags && + git fetch origin refs/heads/master:refs/tags/sometag && + + git fetch --prune --tags origin && + git rev-parse origin/master && + test_must_fail git rev-parse somebranch +' + +test_expect_failure 'fetch --prune --tags with branch does not delete = other remote-tracking branches' ' + cd "$D" && + git clone . prune-tags-branch && + cd prune-tags-branch && + git fetch origin refs/heads/master:refs/remotes/origin/extrabranch && + + git fetch --prune --tags origin master && + git rev-parse origin/extrabranch +' + test_expect_success 'fetch tags when there is no tags' ' =20 cd "$D" && --=20 1.7.5.2.354.g349bf