comparison extra/soundsoftware/update-external-repo.sh @ 431:d3af621ba9d4 bug_168

Update the master branch via git pull master rather than git fetch (which doesn't merge any particular branch)

     echo "$$: Mirror for project $project exists at $project_repo_mirror, updating" 1>&2
 
     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
 
 else