aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmtd <jmtd@web>2020-04-06 05:38:28 -0400
committeradmin <admin@branchable.com>2020-04-06 05:38:28 -0400
commit864b1e5a780a2dcbde02a7cd74980eac672b67bf (patch)
tree501054ea7f43b9eb091b0b2b76d4c45305514df1
parent505ac46c2625dea7359a24f3ed253bc1d4081cd1 (diff)
downloadikiwiki-864b1e5a780a2dcbde02a7cd74980eac672b67bf.tar
ikiwiki-864b1e5a780a2dcbde02a7cd74980eac672b67bf.tar.gz
-rw-r--r--doc/bugs/git_plugin_should_support_force-pushed_src_repos.mdwn8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/bugs/git_plugin_should_support_force-pushed_src_repos.mdwn b/doc/bugs/git_plugin_should_support_force-pushed_src_repos.mdwn
new file mode 100644
index 000000000..a9358dbc0
--- /dev/null
+++ b/doc/bugs/git_plugin_should_support_force-pushed_src_repos.mdwn
@@ -0,0 +1,8 @@
+If you force-push to a source repository that is the configured git repository for the ikiwiki srcdir,
+rebuilding the wiki (after the hook) fails with
+
+ fatal: refusing to merge unrelated histories
+ 'git pull --prune origin' failed: at /usr/local/share/perl/5.28.1/IkiWiki/Plugin/git.pm line 251.
+
+I think that under some circumstances ikiwiki should support this. Perhaps via configuration options
+for the git plugin. — [[Jon]]