undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Let check_preimage() use memset() to initialize "struct checkout"
  fetch/push: fix usage strings
This commit is contained in:
Junio C Hamano 2010-04-09 22:43:18 -07:00
commit 3b0c19663e
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-fetch.txt
View File

@ -8,13 +8,13 @@ git-fetch - Download objects and refs from another repository
SYNOPSIS SYNOPSIS
-------- --------
'git fetch' <options> <repository> <refspec>... 'git fetch' [<options>] [<repository> [<refspec>...]]
'git fetch' <options> <group> 'git fetch' [<options>] <group>
'git fetch' --multiple <options> [<repository> | <group>]... 'git fetch' --multiple [<options>] [<repository> | <group>]...
'git fetch' --all <options> 'git fetch' --all [<options>]
DESCRIPTION DESCRIPTION

2
Documentation/git-push.txt
View File

@ -11,7 +11,7 @@ SYNOPSIS
[verse] [verse]
'git push' [--all | --mirror | --tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>] 'git push' [--all | --mirror | --tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
[--repo=<repository>] [-f | --force] [-v | --verbose] [-u | --set-upstream] [--repo=<repository>] [-f | --force] [-v | --verbose] [-u | --set-upstream]
[<repository> <refspec>...] [<repository> [<refspec>...]]
DESCRIPTION DESCRIPTION
----------- -----------

5
builtin/apply.c
View File

@ -2824,11 +2824,8 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
if (stat_ret < 0) { if (stat_ret < 0) {
struct checkout costate; struct checkout costate;
/* checkout */ /* checkout */
memset(&costate, 0, sizeof(costate));
costate.base_dir = ""; costate.base_dir = "";
costate.base_dir_len = 0;
costate.force = 0;
costate.quiet = 0;
costate.not_new = 0;
costate.refresh_cache = 1; costate.refresh_cache = 1;
if (checkout_entry(*ce, &costate, NULL) || if (checkout_entry(*ce, &costate, NULL) ||
lstat(old_name, st)) lstat(old_name, st))

8
builtin/fetch.c
View File

@ -14,10 +14,10 @@
#include "transport.h" #include "transport.h"
static const char * const builtin_fetch_usage[] = { static const char * const builtin_fetch_usage[] = {
"git fetch [options] [<repository> <refspec>...]", "git fetch [<options>] [<repository> [<refspec>...]]",
"git fetch [options] <group>", "git fetch [<options>] <group>",
"git fetch --multiple [options] [<repository> | <group>]...", "git fetch --multiple [<options>] [<repository> | <group>]...",
"git fetch --all [options]", "git fetch --all [<options>]",
NULL NULL
}; };

2
builtin/push.c
View File

@ -10,7 +10,7 @@
#include "parse-options.h" #include "parse-options.h"
static const char * const push_usage[] = { static const char * const push_usage[] = {
"git push [<options>] [<repository> <refspec>...]", "git push [<options>] [<repository> [<refspec>...]]",
NULL, NULL,
}; };