diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-25 23:23:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-25 23:23:26 (GMT) |
| commit | 5cfe4256d98af22a570c78c5e3048391a90f5f98 (patch) | |
| tree | 2a168e5e4c4f52e0c58c6078304c9757f728c4e6 /builtin | |
| parent | 84da3e21dc008fe7ba18811e8b7f7614ede33079 (diff) | |
| parent | 4dd1fbc7b1df0030f813a05cee19cad2c7a9cbf9 (diff) | |
| download | git-5cfe4256d98af22a570c78c5e3048391a90f5f98.zip git-5cfe4256d98af22a570c78c5e3048391a90f5f98.tar.gz git-5cfe4256d98af22a570c78c5e3048391a90f5f98.tar.bz2 | |
Merge branch 'jc/bigfile'
* jc/bigfile:
Bigfile: teach "git add" to send a large file straight to a pack
index_fd(): split into two helper functions
index_fd(): turn write_object and format_check arguments into one flag
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/hash-object.c | 5 | ||||
| -rw-r--r-- | builtin/update-index.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/builtin/hash-object.c b/builtin/hash-object.c index b96f46a..33911fd 100644 --- a/builtin/hash-object.c +++ b/builtin/hash-object.c @@ -14,8 +14,11 @@ static void hash_fd(int fd, const char *type, int write_object, const char *path { struct stat st; unsigned char sha1[20]; + unsigned flags = (HASH_FORMAT_CHECK | + (write_object ? HASH_WRITE_OBJECT : 0)); + if (fstat(fd, &st) < 0 || - index_fd(sha1, fd, &st, write_object, type_from_string(type), path, 1)) + index_fd(sha1, fd, &st, type_from_string(type), path, flags)) die(write_object ? "Unable to add %s to database" : "Unable to hash %s", path); diff --git a/builtin/update-index.c b/builtin/update-index.c index d7850c6..f14bc90 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -99,7 +99,8 @@ static int add_one_path(struct cache_entry *old, const char *path, int len, stru fill_stat_cache_info(ce, st); ce->ce_mode = ce_mode_from_stat(old, st->st_mode); - if (index_path(ce->sha1, path, st, !info_only)) + if (index_path(ce->sha1, path, st, + info_only ? 0 : HASH_WRITE_OBJECT)) return -1; option = allow_add ? ADD_CACHE_OK_TO_ADD : 0; option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0; |