kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jn/maint-http-fetch-mingw' into jn/help-everywhere 

* jn/maint-http-fetch-mingw:
  http-fetch: add missing initialization of argv0_path
  merge: do not setup worktree twice
  check-ref-format: update usage string

Conflicts:
	builtin-check-ref-format.c
maint
Junio C Hamano 2009-11-10 11:10:14 -08:00
parent 4751f11224 f01d749603
commit 1a507b9cf7
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-check-ref-format.c
View File

@ -7,6 +7,10 @@
#include "builtin.h" #include "builtin.h"
#include "strbuf.h" #include "strbuf.h"


static const char builtin_check_ref_format_usage[] =
"git check-ref-format [--print] <refname>\n"
" or: git check-ref-format --branch <branchname-shorthand>";

/* /*
* Replace each run of adjacent slashes in src with a single slash, * Replace each run of adjacent slashes in src with a single slash,
* and write the result to dst. * and write the result to dst.
@ -52,6 +56,6 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
exit(0); exit(0);
} }
if (argc != 2) if (argc != 2)
usage("git check-ref-format refname"); usage(builtin_check_ref_format_usage);
return !!check_ref_format(argv[1]); return !!check_ref_format(argv[1]);
} }

1
builtin-merge.c
View File

@ -843,7 +843,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
const char *best_strategy = NULL, *wt_strategy = NULL; const char *best_strategy = NULL, *wt_strategy = NULL;
struct commit_list **remotes = &remoteheads; struct commit_list **remotes = &remoteheads;


setup_work_tree();
if (file_exists(git_path("MERGE_HEAD"))) if (file_exists(git_path("MERGE_HEAD")))
die("You have not concluded your merge. (MERGE_HEAD exists)"); die("You have not concluded your merge. (MERGE_HEAD exists)");
if (read_cache_unmerged()) if (read_cache_unmerged())

3
http-fetch.c
View File

@ -1,4 +1,5 @@
#include "cache.h" #include "cache.h"
#include "exec_cmd.h"
#include "walker.h" #include "walker.h"


int main(int argc, const char **argv) int main(int argc, const char **argv)
@ -19,8 +20,8 @@ int main(int argc, const char **argv)
int get_verbosely = 0; int get_verbosely = 0;
int get_recover = 0; int get_recover = 0;


git_extract_argv0_path(argv[0]);
prefix = setup_git_directory(); prefix = setup_git_directory();

git_config(git_default_config, NULL); git_config(git_default_config, NULL);


while (arg < argc && argv[arg][0] == '-') { while (arg < argc && argv[arg][0] == '-') {