From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from mail-qa0-x22b.google.com ([2607:f8b0:400d:c00::22b])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <jonringle@gmail.com>) id 1W9du5-0006kK-62
	for ptxdist@pengutronix.de; Sat, 01 Feb 2014 17:58:50 +0100
Received: by mail-qa0-f43.google.com with SMTP id o15so7924095qap.16
	for <ptxdist@pengutronix.de>; Sat, 01 Feb 2014 08:58:42 -0800 (PST)
From: jon@ringle.org
Date: Sat,  1 Feb 2014 11:58:27 -0500
Message-Id: <1391273907-22030-1-git-send-email-jon@ringle.org>
Subject: [ptxdist] [PATCH] git: use git remote rm for backward compatibility
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de
Cc: Jon Ringle <jringle@gridpoint.com>

From: Jon Ringle <jringle@gridpoint.com>

In scripts/lib/ptxd_make_get.sh there is a git call for:
        git --git-dir="${mirror}" remote remove origin

This fails on git 1.7.10.4:

git: fetching 'https://git.gridpoint.com/git/gpec/linux-ec1k.git into '/home/jringle/ptxdist-src/git.gridpoint.com.git.gpec.linux-ec1k.git'...
error: Unknown subcommand: remove
usage: git remote [-v | --verbose]
   or: git remote add [-t <branch>] [-m <master>] [-f] [--mirror=<fetch|push>] <name> <url>
   or: git remote rename <old> <new>
   or: git remote rm <name>
   or: git remote set-head <name> (-a | -d | <branch>)
   or: git remote [-v | --verbose] show [-n] <name>
   or: git remote prune [-n | --dry-run] <name>
   or: git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]
   or: git remote set-branches [--add] <name> <branch>...
   or: git remote set-url <name> <newurl> [<oldurl>]
   or: git remote set-url --add <name> <newurl>
   or: git remote set-url --delete <name> <url>

    -v, --verbose         be verbose; must be placed before a subcommand

fatal: remote origin already exists.

On git 1.7.10.4, the command is 'git remote rm', not 'git remote remove'

According to the git.git commit [1] that changed this,
rm is still support, just not advertised in help.

[1] http://code.google.com/p/git-core/source/detail?spec=svne17dba8fe15028425acd6a4ebebf1b8e9377d3c6&r=e17dba8fe15028425acd6a4ebebf1b8e9377d3c6

Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
 scripts/lib/ptxd_make_get.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
index a33aca3..9f388dd 100644
--- a/scripts/lib/ptxd_make_get.sh
+++ b/scripts/lib/ptxd_make_get.sh
@@ -122,7 +122,7 @@ ptxd_make_get_git() {
 	if [ ! -d "${mirror}" ]; then
 		git init --bare --shared "${mirror}"
 	else
-		git --git-dir="${mirror}" remote remove origin
+		git --git-dir="${mirror}" remote rm origin
 	fi
 	# overwrite everything so the git repository is in a defined state
 	git --git-dir="${mirror}" config transfer.fsckObjects true &&
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de