Merge branch 'tz/complete-branch-copy' into maint

diff --git a/advice.c b/advice.c
index e0611d52bdbaf269f39700ab3542b27f0846a319..d81e1cb7425b0f2d75461865b5c965a21ada5587 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "config.h"
 
 int advice_push_update_rejected = 1;
 int advice_push_non_ff_current = 1;