From: Jeff Hostetler <jeffh...@microsoft.com>
Created core.aheadbehind config setting and core_ahead_behind
global variable. This value defaults to true.
This value will be used in the next few commits as the default value
for the --ahead-behind parameter.
Signed-off-by: Jeff Hostetler <jeffh...@microsoft.com>
---
Documentation/config.txt | 8 ++++++++
cache.h | 1 +
config.c | 5 +++++
environment.c | 1 +
4 files changed, 15 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9593bfa..c78d6be 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -895,6 +895,14 @@ core.abbrev::
abbreviated object names to stay unique for some time.
The minimum length is 4.
+core.aheadbehind::
+ If true, tells commands like status and branch to print ahead and
+ behind counts for the branch relative to its upstream branch.
+ This computation may be very expensive when there is a great
+ distance between the two branches. If false, these commands
+ only print that the two branches refer to different commits.
+ Defaults to true.
+
add.ignoreErrors::
add.ignore-errors (deprecated)::
Tells 'git add' to continue adding files when some files cannot be
diff --git a/cache.h b/cache.h
index 6440e2b..5757d8f 100644
--- a/cache.h
+++ b/cache.h
@@ -735,6 +735,7 @@ extern int assume_unchanged;
extern int prefer_symlink_refs;
extern int warn_ambiguous_refs;
extern int warn_on_object_refname_ambiguity;
+extern int core_ahead_behind;
extern const char *apply_default_whitespace;
extern const char *apply_default_ignorewhitespace;
extern const char *git_attributes_file;
diff --git a/config.c b/config.c
index c38401a..6a4b49c 100644
--- a/config.c
+++ b/config.c
@@ -1241,6 +1241,11 @@ static int git_default_core_config(const char *var,
const char *value)
return 0;
}
+ if (!strcmp(var, "core.aheadbehind")) {
+ core_ahead_behind = git_config_bool(var, value);
+ return 0;
+ }
+
/* Add other config variables here and to Documentation/config.txt. */
return 0;
}
diff --git a/environment.c b/environment.c
index 8289c25..5822c15 100644
--- a/environment.c
+++ b/environment.c
@@ -25,6 +25,7 @@ int prefer_symlink_refs;
int is_bare_repository_cfg = -1; /* unspecified */
int warn_ambiguous_refs = 1;
int warn_on_object_refname_ambiguity = 1;
+int core_ahead_behind = 1;
int ref_paranoia = -1;
int repository_format_precious_objects;
const char *git_commit_encoding;
--
2.9.3
