OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jk/diff-blob' into maint
[git-core/git.git]
/
builtin
/
cat-file.c
diff --git
a/builtin/cat-file.c
b/builtin/cat-file.c
index
b91b167
..
188ddc3
100644
(file)
--- a/
builtin/cat-file.c
+++ b/
builtin/cat-file.c
@@
-4,7
+4,9
@@
* Copyright (C) Linus Torvalds, 2005
*/
#include "cache.h"
* Copyright (C) Linus Torvalds, 2005
*/
#include "cache.h"
+#include "config.h"
#include "builtin.h"
#include "builtin.h"
+#include "diff.h"
#include "parse-options.h"
#include "userdiff.h"
#include "streaming.h"
#include "parse-options.h"
#include "userdiff.h"
#include "streaming.h"
@@
-55,11
+57,11
@@
static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
struct object_context obj_context;
struct object_info oi = OBJECT_INFO_INIT;
struct strbuf sb = STRBUF_INIT;
struct object_context obj_context;
struct object_info oi = OBJECT_INFO_INIT;
struct strbuf sb = STRBUF_INIT;
- unsigned flags =
LOOKUP_REPLACE_OBJECT
;
+ unsigned flags =
OBJECT_INFO_LOOKUP_REPLACE
;
const char *path = force_path;
if (unknown_type)
const char *path = force_path;
if (unknown_type)
- flags |=
LOOKUP_UNKNOWN_OBJECT
;
+ flags |=
OBJECT_INFO_ALLOW_UNKNOWN_TYPE
;
if (get_sha1_with_context(obj_name, GET_SHA1_RECORD_PATH,
oid.hash, &obj_context))
if (get_sha1_with_context(obj_name, GET_SHA1_RECORD_PATH,
oid.hash, &obj_context))
@@
-166,6
+168,7
@@
static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
die("git cat-file %s: bad file", obj_name);
write_or_die(1, buf, size);
die("git cat-file %s: bad file", obj_name);
write_or_die(1, buf, size);
+ free(buf);
free(obj_context.path);
return 0;
}
free(obj_context.path);
return 0;
}
@@
-335,7
+338,8
@@
static void batch_object_write(const char *obj_name, struct batch_options *opt,
struct strbuf buf = STRBUF_INIT;
if (!data->skip_object_info &&
struct strbuf buf = STRBUF_INIT;
if (!data->skip_object_info &&
- sha1_object_info_extended(data->oid.hash, &data->info, LOOKUP_REPLACE_OBJECT) < 0) {
+ sha1_object_info_extended(data->oid.hash, &data->info,
+ OBJECT_INFO_LOOKUP_REPLACE) < 0) {
printf("%s missing\n",
obj_name ? obj_name : oid_to_hex(&data->oid));
fflush(stdout);
printf("%s missing\n",
obj_name ? obj_name : oid_to_hex(&data->oid));
fflush(stdout);