summaryrefslogtreecommitdiff
path: root/builtin/cat-file.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2013-12-11 07:46:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-12 19:53:48 (GMT)
commitde7b5d6218e4b928c5a395e34e5e1de40fae2a0d (patch)
tree6473995f18b338fa7278a44f2a4348fecabc4f74 /builtin/cat-file.c
parentbf93eea0f67082ec295ac60fa78986f339adf2c6 (diff)
downloadgit-de7b5d6218e4b928c5a395e34e5e1de40fae2a0d.zip
git-de7b5d6218e4b928c5a395e34e5e1de40fae2a0d.tar.gz
git-de7b5d6218e4b928c5a395e34e5e1de40fae2a0d.tar.bz2
sha1_object_info_extended(): add an "unsigned flags" parameter
This parameter is not used yet, but it will be used to tell sha1_object_info_extended() if it should perform object replacement or not. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/cat-file.c')
-rw-r--r--builtin/cat-file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index b2ca775..b15c064 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -238,7 +238,7 @@ static int batch_one_object(const char *obj_name, struct batch_options *opt,
return 0;
}
- if (sha1_object_info_extended(data->sha1, &data->info) < 0) {
+ if (sha1_object_info_extended(data->sha1, &data->info, LOOKUP_REPLACE_OBJECT) < 0) {
printf("%s missing\n", obj_name);
fflush(stdout);
return 0;