From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: [PATCH 4/6] Test "git remote show" and "git remote prune" Date: Sat, 1 Mar 2008 13:16:29 +0000 (GMT) Message-ID: References: <7vprugfrgw.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Sat Mar 01 14:17:56 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JVRb2-0007a8-Lx for gcvg-git-2@gmane.org; Sat, 01 Mar 2008 14:17:49 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755969AbYCANRL (ORCPT ); Sat, 1 Mar 2008 08:17:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755959AbYCANRL (ORCPT ); Sat, 1 Mar 2008 08:17:11 -0500 Received: from mail.gmx.net ([213.165.64.20]:53998 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755890AbYCANRK (ORCPT ); Sat, 1 Mar 2008 08:17:10 -0500 Received: (qmail invoked by alias); 01 Mar 2008 13:17:09 -0000 Received: from host86-138-198-40.range86-138.btcentralplus.com (EHLO racer.home) [86.138.198.40] by mail.gmx.net (mp047) with SMTP; 01 Mar 2008 14:17:09 +0100 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX18CEUch+FICaXlLv/0mS0JempHiPGgbAw5K18oY86 jAQnlaX7QYDlRt X-X-Sender: gene099@racer.site In-Reply-To: User-Agent: Alpine 1.00 (LSU 882 2007-12-20) X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: While at it, also fix a few instances where a cd was done outside of a subshell. Signed-off-by: Johannes Schindelin --- t/t5505-remote.sh | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 4fc62f5..e1e0a18 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -94,4 +94,38 @@ test_expect_success 'remove remote' ' ) ' +cat > test/expect << EOF +* remote origin + URL: $(pwd)/one/.git + Remote branch(es) merged with 'git pull' while on branch master + master + New remote branches (next fetch will store in remotes/origin) + master + Tracked remote branches + side master +EOF + +test_expect_success 'show' ' + (cd test && + git config --add remote.origin.fetch \ + refs/heads/master:refs/heads/upstream && + git fetch && + git branch -d -r origin/master && + (cd ../one && + echo 1 > file && + git commit -m update file) && + git remote show origin > output && + git diff expect output) +' + +test_expect_success 'prune' ' + (cd one && + git branch -m side side2) && + (cd test && + git fetch origin && + git remote prune origin && + git rev-parse refs/remotes/origin/side2 && + ! git rev-parse refs/remotes/origin/side) +' + test_done -- 1.5.4.3.446.gbe8932