builtin/branch: stop supporting the "--set-upstream" option

diff --git a/unpack-trees.c b/unpack-trees.c
index 491a2562adc9f76db454af4cdd454c55c6359c1a..862cfce661e57e50f7c6030dd5a8eda0add0cca5 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1,5 +1,6 @@
 #define NO_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
+#include "config.h"
 #include "dir.h"
 #include "tree.h"
 #include "tree-walk.h"