Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
push: test to verify that push errors are colored
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index 8746c5e3e867d79c85728974825ebca4b07a2e9a..9db5a2cf16e189bb3bd0ceec7d34c6651d630225 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-412,7
+412,7
@@
static void finish(struct commit *head_commit,
* We ignore errors in 'gc --auto', since the
* user should see them.
*/
- close_all_packs();
+ close_all_packs(
the_repository->objects
);
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
}
}