Merge branch 'jk/use-compat-util-in-test-tool'

diff --git a/branch.h b/branch.h
index 7d9b330ebabacb70ae428a92a7e4487116e91f54..5cace4581fe43aa5fdc20b4315cee6eff1034003 100644 (file)
--- a/branch.h
+++ b/branch.h
@@ -3,6 +3,17 @@
 
 struct strbuf;
 
+enum branch_track {
+       BRANCH_TRACK_UNSPECIFIED = -1,
+       BRANCH_TRACK_NEVER = 0,
+       BRANCH_TRACK_REMOTE,
+       BRANCH_TRACK_ALWAYS,
+       BRANCH_TRACK_EXPLICIT,
+       BRANCH_TRACK_OVERRIDE
+};
+
+extern enum branch_track git_branch_track;
+
 /* Functions for acting on the information about branches. */
 
 /*