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
2009-07-25 00:45:03 -07:00
parent a7c1ef3e03 7f3140cd23
commit 130b04ab37
7 changed files with 31 additions and 3 deletions
--- a/cache.h
+++ b/cache.h
@ -560,6 +560,8 @@ enum object_creation_mode {

 extern enum object_creation_mode object_creation_mode;

+extern int grafts_replace_parents;
+
 #define GIT_REPO_VERSION 0
 extern int repository_format_version;
 extern int check_repository_format(void);