diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-10 05:43:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-10 05:43:18 (GMT) |
| commit | 3b0c19663e7976cd32188b42e762c980d1bb93d4 (patch) | |
| tree | 73c9c829d7cc48cfa92417c8f9c2160c3f3a5882 /builtin/apply.c | |
| parent | da288e25d9e10b746cf3b311cb4503d1810cde37 (diff) | |
| parent | 54fd955c211db6f4a2c91301f792ec9de86eed31 (diff) | |
| download | git-3b0c19663e7976cd32188b42e762c980d1bb93d4.zip git-3b0c19663e7976cd32188b42e762c980d1bb93d4.tar.gz git-3b0c19663e7976cd32188b42e762c980d1bb93d4.tar.bz2 | |
Merge branch 'maint'
* maint:
Let check_preimage() use memset() to initialize "struct checkout"
fetch/push: fix usage strings
Diffstat (limited to 'builtin/apply.c')
| -rw-r--r-- | builtin/apply.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 7ca9047..771c972 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -2824,11 +2824,8 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s if (stat_ret < 0) { struct checkout costate; /* checkout */ + memset(&costate, 0, sizeof(costate)); costate.base_dir = ""; - costate.base_dir_len = 0; - costate.force = 0; - costate.quiet = 0; - costate.not_new = 0; costate.refresh_cache = 1; if (checkout_entry(*ce, &costate, NULL) || lstat(old_name, st)) |