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

sha1-name.c: remove the_repo from maybe_die_on_misspelt_object_name 

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2019-04-16 16:33:39 +07:00 committed by Junio C Hamano
parent d9b8b8f896
commit e270f42c4d
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cache.h
View File

@ -1387,7 +1387,9 @@ extern int get_oid_committish(const char *str, struct object_id *oid);
extern int get_oid_tree(const char *str, struct object_id *oid); extern int get_oid_tree(const char *str, struct object_id *oid);
extern int get_oid_treeish(const char *str, struct object_id *oid); extern int get_oid_treeish(const char *str, struct object_id *oid);
extern int get_oid_blob(const char *str, struct object_id *oid); extern int get_oid_blob(const char *str, struct object_id *oid);
extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix); void maybe_die_on_misspelt_object_name(struct repository *repo,
const char *name,
const char *prefix);
extern enum get_oid_result get_oid_with_context(struct repository *repo, const char *str, extern enum get_oid_result get_oid_with_context(struct repository *repo, const char *str,
unsigned flags, struct object_id *oid, unsigned flags, struct object_id *oid,
struct object_context *oc); struct object_context *oc);

7
setup.c
View File

@ -164,7 +164,8 @@ int check_filename(const char *prefix, const char *arg)
die_errno(_("failed to stat '%s'"), arg); die_errno(_("failed to stat '%s'"), arg);
} }


static void NORETURN die_verify_filename(const char *prefix, static void NORETURN die_verify_filename(struct repository *r,
const char *prefix,
const char *arg, const char *arg,
int diagnose_misspelt_rev) int diagnose_misspelt_rev)
{ {
@ -179,7 +180,7 @@ static void NORETURN die_verify_filename(const char *prefix,
* let maybe_die_on_misspelt_object_name() even trigger. * let maybe_die_on_misspelt_object_name() even trigger.
*/ */
if (!(arg[0] == ':' && !isalnum(arg[1]))) if (!(arg[0] == ':' && !isalnum(arg[1])))
maybe_die_on_misspelt_object_name(arg, prefix); maybe_die_on_misspelt_object_name(r, arg, prefix);


/* ... or fall back the most general message. */ /* ... or fall back the most general message. */
die(_("ambiguous argument '%s': unknown revision or path not in the working tree.\n" die(_("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@ -234,7 +235,7 @@ void verify_filename(const char *prefix,
die(_("option '%s' must come before non-option arguments"), arg); die(_("option '%s' must come before non-option arguments"), arg);
if (looks_like_pathspec(arg) || check_filename(prefix, arg)) if (looks_like_pathspec(arg) || check_filename(prefix, arg))
return; return;
die_verify_filename(prefix, arg, diagnose_misspelt_rev); die_verify_filename(the_repository, prefix, arg, diagnose_misspelt_rev);
} }


/* /*

6
sha1-name.c
View File

@ -1885,11 +1885,13 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
* exist in 'HEAD'" when given "HEAD:doc", or it may return in which case * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
* you have a chance to diagnose the error further. * you have a chance to diagnose the error further.
*/ */
void maybe_die_on_misspelt_object_name(const char *name, const char *prefix) void maybe_die_on_misspelt_object_name(struct repository *r,
const char *name,
const char *prefix)
{ {
struct object_context oc; struct object_context oc;
struct object_id oid; struct object_id oid;
get_oid_with_context_1(the_repository, name, GET_OID_ONLY_TO_DIE, get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE,
prefix, &oid, &oc); prefix, &oid, &oc);
} }