Update git-core to v2.20.0

glandium · Dec 11, 2018 · cf440d6 · cf440d6
1 parent 0da24b8
commit cf440d6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CI/tools.py b/CI/tools.py
@@ -15,7 +15,7 @@
 
 
 MERCURIAL_VERSION = '4.7'
-GIT_VERSION = '2.19.1'
+GIT_VERSION = '2.20.0'
 
 ALL_MERCURIAL_VERSIONS = (
     '1.9.3', '2.0.2', '2.1.2', '2.2.3', '2.3.2', '2.4.2', '2.5.4',

diff --git a/git-core b/git-core
diff --git a/helper/GIT-VERSION.mk b/helper/GIT-VERSION.mk
@@ -1,2 +1,2 @@
-GIT_VERSION ?= v2.19.1
+GIT_VERSION ?= v2.20.0
 WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1
diff --git a/helper/cinnabar-helper.c b/helper/cinnabar-helper.c
@@ -1461,7 +1461,7 @@ static void upgrade_files(const struct old_manifest_tree *tree,
 				goto corrupted;
 		}
 		display_progress(track->progress,
-		                 hashmap_get_size(&track->set.map.map));
+		                 kh_size(&track->set.set));
 	}
 
 	free_tree_buffer(state.tree_git);