summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-07-25 00:45:03 -0700
committerJunio C Hamano <gitster@pobox.com>2009-07-25 00:45:03 -0700
commit130b04ab37d74e574d525df7948b963b13c6bdbf (patch)
treea39a6d5e46d3ee24dcc1f2f141efe4f0a20a9581 /environment.c
parenta7c1ef3e03985c70aeb0825634471bb6240f4fcb (diff)
parent7f3140cd23f126e578ccaaea8c2cebe36824a7ac (diff)
downloadgit-130b04ab37d74e574d525df7948b963b13c6bdbf.tar.gz
Merge branch 'js/maint-graft-unhide-true-parents'
* js/maint-graft-unhide-true-parents: git repack: keep commits hidden by a graft Add a test showing that 'git repack' throws away grafted-away parents Conflicts: git-repack.sh
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index 720f26b67d..8f5eaa7dd8 100644
--- a/environment.c
+++ b/environment.c
@@ -47,6 +47,7 @@ enum push_default_type push_default = PUSH_DEFAULT_MATCHING;
#define OBJECT_CREATION_MODE OBJECT_CREATION_USES_HARDLINKS
#endif
enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
+int grafts_replace_parents = 1;
/* Parallel index stat data preload? */
int core_preload_index = 0;