Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
l10n: fr v2.23.0 round 2
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index e7aeedc77da1f06840714b86a90c7eb56e5b714b..e2ccbc44e204173b09f5ad4b704a31a9e8643bb6 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-453,7
+453,7
@@
static void finish(struct commit *head_commit,
* We ignore errors in 'gc --auto', since the
* user should see them.
*/
- close_
all_packs
(the_repository->objects);
+ close_
object_store
(the_repository->objects);
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
}
}