Mercurial > hg > soundsoftware-site

changeset 431:d3af621ba9d4 bug_168

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update the master branch via git pull master rather than git fetch (which doesn't merge any particular branch)
author Chris Cannam
date Sun, 05 Jun 2011 10:28:27 +0100
parents 50fd9c6b93a9
children 7fd72f22a42b
files extra/soundsoftware/update-external-repo.sh
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/extra/soundsoftware/update-external-repo.sh	Tue May 10 12:00:10 2011 +0100
+++ b/extra/soundsoftware/update-external-repo.sh	Sun Jun 05 10:28:27 2011 +0100
@@ -68,7 +68,7 @@
     if [ -d "$project_repo_mirror/.hg" ]; then
 	hg --config extensions.convert= convert --datesort "$remote_repo" "$project_repo_mirror" && success=true
     elif [ -d "$project_repo_mirror/.git" ]; then
-	( cd "$project_repo_mirror" && git fetch "$remote_repo" ) && success=true
+	( cd "$project_repo_mirror" && git pull "$remote_repo" master ) && success=true
     else 
 	echo "$$: ERROR: Repo mirror dir $project_repo_mirror exists but is not an Hg or git repo" 1>&2
     fi