summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-09-14 15:45:38 -0400
committerJoey Hess <joey@kitenet.net>2010-09-14 15:45:38 -0400
commitcd794613b6f5140365e51f79023c882e8ea71197 (patch)
tree5a59301da5e14c8f4cdcd5f1d31a4558e87ae78d /IkiWiki/Plugin
parent8c8d2c2d2cd259f3e72fd0a4022d02e15e66104f (diff)
git: When updating from remote, use git pull --prune, to avoid possible errors from conflicting obsolete remote branches.
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/git.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index d342a7398..fd57ce1e4 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -462,7 +462,7 @@ sub rcs_update () {
# Update working directory.
if (length $config{gitorigin_branch}) {
- run_or_cry('git', 'pull', $config{gitorigin_branch});
+ run_or_cry('git', 'pull', '--prune', $config{gitorigin_branch});
}
}