[ptxdist] [PATCH] git: use git remote rm for backward compatibility

[ptxdist] [PATCH] git: use git remote rm for backward compatibility

[jon]

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

Re: [ptxdist] [PATCH] git: use git remote rm for backward compatibility

[Michael Olbrich]

On Sat, Feb 01, 2014 at 11:58:27AM -0500, jon@ringle.org wrote:
> 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>

Thanks, applied.

Michael

> ---
>  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
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de