Permalink
Browse files

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
  • Loading branch information...
gitster committed Nov 10, 2009
2 parents 4751f11 + f01d749 commit 1a507b9cf75bcb2de2391c584539e0ff202549bf
Showing with 7 additions and 3 deletions.
  1. +5 −1 builtin-check-ref-format.c
  2. +0 −1 builtin-merge.c
  3. +2 −1 http-fetch.c
@@ -7,6 +7,10 @@
#include "builtin.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,
* 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);
}
if (argc != 2)
- usage("git check-ref-format refname");
+ usage(builtin_check_ref_format_usage);
return !!check_ref_format(argv[1]);
}
View
@@ -843,7 +843,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
const char *best_strategy = NULL, *wt_strategy = NULL;
struct commit_list **remotes = &remoteheads;
- setup_work_tree();
if (file_exists(git_path("MERGE_HEAD")))
die("You have not concluded your merge. (MERGE_HEAD exists)");
if (read_cache_unmerged())
View
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "exec_cmd.h"
#include "walker.h"
int main(int argc, const char **argv)
@@ -19,8 +20,8 @@ int main(int argc, const char **argv)
int get_verbosely = 0;
int get_recover = 0;
+ git_extract_argv0_path(argv[0]);
prefix = setup_git_directory();
-
git_config(git_default_config, NULL);
while (arg < argc && argv[arg][0] == '-') {

0 comments on commit 1a507b9

Please sign in to comment.