Using git on FreeBSD Using git on FreeBSD

Using git on FreeBSD

来自 http://blogs.ittoolbox.com/unix/bsd/archives/using-git-on-freebsd-13680

Dru (SysAdmin, Technical Writer, Technical Trainer) Posted 12/29/2006
Comments (4) | Trackbacks (0)

In the previous post I mentioned an alternate FreeBSD ports repository using git. I've been using this technique for about a week and will demonstrate how it differs from cvsup.

I first heard about git from its creator, Linus Torvalds, when he responded to my OPRP questionnaire regarding port 9418. (On a side note, Linus responded within half an hour on a Easter Sunday which duly impressed my boyfriend, a long time user.) Linus described the git protocol as follows:

"This protocol is used for space-efficient public synchronization of Git repositories. Git is a opensource distributed SCM, used by projects like the Linux kernel and Wine, Cairo and xorg to maintain source code history. The git protocol allows either private and secure read-write transport over SSH, or public anonymous read-only access using the git port."

Earlier this month I found the GitConversion page on the FreeBSD Developers Wiki. Since git is in the running for FreeBSD's future revision control system and I wanted to give the experimental xorg a go, it seemed the ideal time to integrate git into my daily routine.

Current Command Sequence

Over the years, I have myself down to 2 scriptable cvsup routines. Routine 1 is for systems running the full ports collection:

cvsup -L2 cvs-supfile (using a cvs-supfile containing ports-all tag=. and a refuse file for unwanted skeletons)
cd /usr/ports
make fetchindex
portsdb -u

Routine 2 is for systems using porteasy to only download the skeletons for installed software. This routine does not include a ports-all line in the cvs-supfile and adds this command after the portsdb -u:

porteasy -uI

Setting up git

Assuming an existing ports collection, this set of commands will switch you over to the git repository:

pkg_add -r git
rehash
cd /usr
rm -Rf ports
git clone git://git.geekfire.com/git/ports.git
remote: Generating pack...
remote: Done counting 133999 objects.
remote: Deltifying 133999 objects.
remote: 100% (133999/133999) done
Indexing 133999 objects.
remote: Total 133999, written 133999 (delta 17412), reused 106595 (delta 4434)
100% (133999/133999) done
Resolving 17412 deltas.
100% (17412/17412) done
Checking files out...
100% (87985/87985) done
cd ports
git checkout xorg

In a day or so, you can update your repository using:

cd /usr/ports
git pull origin xorg
remote: Generating pack...
remote: Done counting 4507 objects.
remote: Result has 2855 objects.
remote: Deltifying 2855 objects.
remote: 100% (2855/2855) done
Unpacking 2855 objects
remote: Total 2855, written 2855 (delta 1354), reused 0 (delta 0)
100% (2855/2855) done
Updating 8c652fd..ebca90e
Fast forward
(snip list of changed files)
175 files changed, 3068 insertions(+), 1853 deletions(-)
create mode 100644 devel/devhelp/files/patch-configure
create mode 100644 devel/devhelp/files/patch-configure.in
rename devel/devhelp/files/{patch-src::dh-base.c => patch-src_dh-base.c} (100%)
create mode 100644 games/quake2-3zb2/Makefile
(snip)
delete mode 100644 science/kst/files/patch-kst-kst-datasources-dirfile-getdata.c
(snip)

I like the layout of the output--it is arranged alphabetically by port and provides a very clear picture of which files have changed (e.g. patches added or removed, modifications to Makefiles, new ports added, ports retired, etc.)

If you are fully up-to-date, you'll instead see:

git pull origin xorg
Already up-to-date.

Currently this repo appears to be updated once a day rather than throughout the day like the cvs servers.

New cvsup routine

My current up-to-date script looks like this:

#!/bin/sh
# echo "Updating src"
cvsup -L2 /root/cvs-supfile

echo "Updating ports"
cd /usr/ports
git pull origin xorg

echo "Updating docs"
cd /usr/doc
cp Makefile.orig Makefile
make install

echo "Check for security vulnerabilities"
portaudit -Fda

echo "The following ports need upgrading"
portversion -l "<"

echo "Finished at `/bin/date`."
exit

This script requires that cvsup-without-gui, docproj-nojadetex, portaudit, and portupgrade be installed.

Thus Far

Thus far, the alternate ports collection is totally transparent. portupgrade and all of its utilities still work as expected. In theory, a periodic run of git pull origin xorg should keep your ports tree in sync.

I have come across one error which I haven't figured out the cause of or a more elegant fix than nuking the ports tree and re-cloning. It looks like this:

git pull origin xorg
fatal: Entry 'MOVED' would be overwritten by merge. Cannot merge.

This appears to be a common error and could happen to any file, not just MOVED. One suggested fix is:

git-update-index --refresh
MOVED: needs update

but that does not fix the error. Linus suggests this:

git-update-cache --refresh
git-update-cache: Command not found.

Anyone know if this command is just missing or if it was renamed to something else?