diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-10 09:43:18 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-10 09:43:18 +0400 |
| commit | 3b0c19663e7976cd32188b42e762c980d1bb93d4 (patch) | |
| tree | 73c9c829d7cc48cfa92417c8f9c2160c3f3a5882 /builtin | |
| parent | da288e25d9e10b746cf3b311cb4503d1810cde37 (diff) | |
| parent | 54fd955c211db6f4a2c91301f792ec9de86eed31 (diff) | |
Merge branch 'maint'
* maint:
Let check_preimage() use memset() to initialize "struct checkout"
fetch/push: fix usage strings
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/apply.c | 5 | ||||
| -rw-r--r-- | builtin/fetch.c | 8 | ||||
| -rw-r--r-- | builtin/push.c | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 7ca90472c1..771c972c55 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)) diff --git a/builtin/fetch.c b/builtin/fetch.c index 957be9f926..8470850415 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -14,10 +14,10 @@ #include "transport.h" static const char * const builtin_fetch_usage[] = { - "git fetch [options] [<repository> <refspec>...]", - "git fetch [options] <group>", - "git fetch --multiple [options] [<repository> | <group>]...", - "git fetch --all [options]", + "git fetch [<options>] [<repository> [<refspec>...]]", + "git fetch [<options>] <group>", + "git fetch --multiple [<options>] [<repository> | <group>]...", + "git fetch --all [<options>]", NULL }; diff --git a/builtin/push.c b/builtin/push.c index 62957ededd..f4358b9d23 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -10,7 +10,7 @@ #include "parse-options.h" static const char * const push_usage[] = { - "git push [<options>] [<repository> <refspec>...]", + "git push [<options>] [<repository> [<refspec>...]]", NULL, }; |