Skip to contentSkip to conversation

New to git: sorry for obvious question.

DISCUSSION Paul Gardiner 4 participants 8 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

Hi,

I've moved a project from CVS on sourceforge to git on repo.or.cz. I want a local mirror on my own home server, so that it appears amongst the projects shown by my own gitweb set up, and so it gets caught by my backup system. I've created the mirror with

  git clone --bare <remote-url> <local-dir>

and that seems fine. But how do I now keep it up to date. I was guessing a cron job doing some sort of git pull, but pull doesn't look to work on --bare proj.git type repositories.

Any help most apprecieated.

Cheers,
Paul.

#1 lore raw
Quoted 7 lines · Paul Gardiner

Hi,

I've moved a project from CVS on sourceforge to git on repo.or.cz. I want a local mirror on my own home server, so that it appears amongst the projects shown by my own gitweb set up, and so it gets caught by my backup system. I've created the mirror with

Quoted 5 lines
   git clone --bare <remote-url> <local-dir>

and that seems fine. But how do I now keep it up to date. I was guessing a cron job doing some sort of git pull, but pull doesn't look to work on --bare proj.git type repositories.

You want git fetch. Git pull also updates the working copy, which you don't have.

Also, git clone --bare doesn't set up the origin configuration, and I have to do it by hand:
git config remote.origin.url "$url"
git config remote.origin.fetch "+refs/heads/*:refs/heads/*"

As for keeping clones up to date, I include a script I use daily for that purpose.

Signature · 2 lines
Luciano Rocha <[email protected]>
Eurotux Informática, S.A. <http://www.eurotux.com/>

#!/bin/bash

cd /media/stuff/src || exit 1

lockf=/tmp/.uprepo.lock
lockfile -60 -l 36000 -r 20 $lockf || exit 1

TL=$((20*60))

running()

{
	kill -0 $* &> /dev/null
}

tl()

{
	local max=$(($1+SECONDS))
	shift
	exec "$@" &
	while running $! &> /dev/null && [ $max -ge $SECONDS ]; do sleep 1; done
	if running $!; then
		kill $! &> /dev/null
		sleep 1
		kill -9 $! &> /dev/null
	fi
}

trap "rm -f $lockf" EXIT

shopt -s dotglob

for i in *.git */*.git; do

	[ -h "$i" ] && continue
	[ -d "$i" ] || continue

	d="${i%/.git}"

	echo $d
	if [ "$d" = "$i" ]; then
		(cd "$d" && tl $TL git fetch) 2>&1 | nocr
	elif [ -d "$i/svn" ]; then
		(cd "$d" && tl $TL git svn fetch) 2>&1 | nocr
	elif [ -e "$d/.cvsurl" ]; then
		(cd "$d" && tl $TL git cvsimport $(<.cvsurl)) 2>&1 | nocr
	elif [ -e "$d/.svnurl" ]; then
		(cd "$d" && tl $TL git svnimport -r $(<.svnurl)) 2>&1 | nocr
	else
		(cd "$d" && tl $TL git pull) 2>&1 | nocr
	fi

done

for i in */*.hg */*/*.hg; do

	[ -h "$i" ] && continue
	[ -d "$i" ] || continue

	d="${i%/.hg}"

	echo $d
	(cd "$d" && tl $TL hg pull)

done

for i in */*_darcs; do

	[ -h "$i" ] && continue
	[ -d "$i" ] || continue

	d="${i%/_darcs}"

	echo $d
	(cd "$d" && tl $TL darcs pull -aq)

done

for i in */.svn; do

	[ -h "$i" ] && continue
	[ -d "$i" ] || continue

	d="${i%/.svn}"

	echo $d
	(cd "$d" && tl $TL svn up -q)

done

for i in */CVS; do

	[ -h "$i" ] && continue
	[ -d "$i" ] || continue

	d="${i%/CVS}"

	echo $d
	(cd "$d" && tl $TL cvs -Q -z3 up -P)

done

#!/usr/bin/perl
use warnings;
use strict;

-t && exec "/bin/cat";

undef $/;

my $in = <>;

$in =~ s/^.*\r(?!\n)//gm;

print $in;

#2 lore raw
Quoted 14 lines · Luciano Rocha
Quoted 7 lines · Paul Gardiner

Hi,

I've moved a project from CVS on sourceforge to git on repo.or.cz. I want a local mirror on my own home server, so that it appears amongst the projects shown by my own gitweb set up, and so it gets caught by my backup system. I've created the mirror with

Quoted 5 lines
   git clone --bare <remote-url> <local-dir>

and that seems fine. But how do I now keep it up to date. I was guessing a cron job doing some sort of git pull, but pull doesn't look to work on --bare proj.git type repositories.

Quoted 7 lines

You want git fetch. Git pull also updates the working copy, which you don't have.

Also, git clone --bare doesn't set up the origin configuration, and I have to do it by hand:
git config remote.origin.url "$url"
git config remote.origin.fetch "+refs/heads/*:refs/heads/*"

Brilliant!! That works.

So why wouldn't git-fetch work when, instead of setting up the origin config, I put the url and refspec on the commandline? - not that it matters, just interested.

Cheers,
Paul.

#3 lore raw
In reply to Luciano Rocha
Quoted 14 lines · Luciano Rocha
Quoted 7 lines · Paul Gardiner

Hi,

I've moved a project from CVS on sourceforge to git on repo.or.cz. I want a local mirror on my own home server, so that it appears amongst the projects shown by my own gitweb set up, and so it gets caught by my backup system. I've created the mirror with

Quoted 5 lines
   git clone --bare <remote-url> <local-dir>

and that seems fine. But how do I now keep it up to date. I was guessing a cron job doing some sort of git pull, but pull doesn't look to work on --bare proj.git type repositories.

Quoted 8 lines

You want git fetch. Git pull also updates the working copy, which you don't have.

Also, git clone --bare doesn't set up the origin configuration, and I have to do it by hand:
git config remote.origin.url "$url"
git config remote.origin.fetch "+refs/heads/*:refs/heads/*"

Better do "git-remote add URL" then manual addition as above.

Boaz

#4 lore raw
Quoted 7 lines · Boaz Harrosh
Quoted 5 lines · Luciano Rocha

Also, git clone --bare doesn't set up the origin configuration, and I have to do it by hand:
git config remote.origin.url "$url"
git config remote.origin.fetch "+refs/heads/*:refs/heads/*"

Better do "git-remote add URL" then manual addition as above.

Would that be git-remote add --mirror origin URL?

#5 lore raw
In reply to Paul Gardiner
Quoted 7 lines · Paul Gardiner

Hi,

I've moved a project from CVS on sourceforge to git on repo.or.cz. I want a local mirror on my own home server, so that it appears amongst the projects shown by my own gitweb set up, and so it gets caught by my backup system. I've created the mirror with

Quoted 5 lines
  git clone --bare <remote-url> <local-dir>

and that seems fine. But how do I now keep it up to date. I was guessing a cron job doing some sort of git pull, but pull doesn't look to work on --bare proj.git type repositories.

You probably want "git fetch". Actually, "git pull" does a fetch first (get the remote revisions that you don't have), and then a merge with your working tree.

Signature · 1 line
Matthieu
#6 lore raw
Quoted 11 lines · Matthieu Moy
Quoted 9 lines · Paul Gardiner

Hi,

I've moved a project from CVS on sourceforge to git on repo.or.cz. I want a local mirror on my own home server, so that it appears amongst the projects shown by my own gitweb set up, and so it gets caught by my backup system. I've created the mirror with

  git clone --bare <remote-url> <local-dir>
Quoted 7 lines
Quoted 3 lines

and that seems fine. But how do I now keep it up to date. I was guessing a cron job doing some sort of git pull, but pull doesn't look to work on --bare proj.git type repositories.

You probably want "git fetch". Actually, "git pull" does a fetch first (get the remote revisions that you don't have), and then a merge with your working tree.

Yeah, that's what I thought, but it doesn't seem to work with --bare
repositories that are of the form proj.git, rather than having a dir proj containing checkout files and a .git folder. Both pull and fetch say that it isn't a git repository (although I can view it under gitweb,
and I can clone and pule from it).

#7 lore raw
Quoted 19 lines · Paul Gardiner
Quoted 9 lines · Matthieu Moy
Quoted 7 lines · Paul Gardiner

Hi,

I've moved a project from CVS on sourceforge to git on repo.or.cz. I want a local mirror on my own home server, so that it appears amongst the projects shown by my own gitweb set up, and so it gets caught by my backup system. I've created the mirror with

Quoted 8 lines
Quoted 5 lines
  git clone --bare <remote-url> <local-dir>

and that seems fine. But how do I now keep it up to date. I was guessing a cron job doing some sort of git pull, but pull doesn't look to work on --bare proj.git type repositories.

You probably want "git fetch". Actually, "git pull" does a fetch first (get the remote revisions that you don't have), and then a merge with your working tree.

Quoted 7 lines

Yeah, that's what I thought, but it doesn't seem to work with --bare repositories that are of the form proj.git, rather than having a dir proj containing checkout files and a .git folder. Both pull and fetch say that it isn't a git repository (although I can view it under gitweb, and I can clone and pule from it).

git-remote update is your friend then

Boaz