mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sha1_name.c: get rid of get_sha1_with_mode()

Browse Source 
There are only two callers, and they will benefit from being able to
pass disambiguation hints to underlying get_sha1_with_context() API
once it happens.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2012-07-02 12:56:44 -07:00
parent 8c135ea260
commit 249c8f4a16
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -812,7 +812,6 @@ struct object_context {
}; };
extern int get_sha1(const char *str, unsigned char *sha1); extern int get_sha1(const char *str, unsigned char *sha1);
extern int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode);
extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix); extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
extern int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc); extern int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc);

12
revision.c
View File

@ -1097,7 +1097,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs,
int flags, int flags,
int cant_be_filename) int cant_be_filename)
{ {
unsigned mode; struct object_context oc;
char *dotdot; char *dotdot;
struct object *object; struct object *object;
unsigned char sha1[20]; unsigned char sha1[20];
@ -1180,13 +1180,13 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs,
local_flags = UNINTERESTING; local_flags = UNINTERESTING;
arg++; arg++;
} }
if (get_sha1_with_mode(arg, sha1, &mode)) if (get_sha1_with_context(arg, sha1, &oc))
return revs->ignore_missing ? 0 : -1; return revs->ignore_missing ? 0 : -1;
if (!cant_be_filename) if (!cant_be_filename)
verify_non_filename(revs->prefix, arg); verify_non_filename(revs->prefix, arg);
object = get_reference(revs, arg, sha1, flags ^ local_flags); object = get_reference(revs, arg, sha1, flags ^ local_flags);
add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags); add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
add_pending_object_with_mode(revs, object, arg, mode); add_pending_object_with_mode(revs, object, arg, oc.mode);
return 0; return 0;
} }
@ -1794,11 +1794,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
if (revs->def && !revs->pending.nr && !got_rev_arg) { if (revs->def && !revs->pending.nr && !got_rev_arg) {
unsigned char sha1[20]; unsigned char sha1[20];
struct object *object; struct object *object;
unsigned mode; struct object_context oc;
if (get_sha1_with_mode(revs->def, sha1, &mode)) if (get_sha1_with_context(revs->def, sha1, &oc))
die("bad default revision '%s'", revs->def); die("bad default revision '%s'", revs->def);
object = get_reference(revs, revs->def, sha1, 0); object = get_reference(revs, revs->def, sha1, 0);
add_pending_object_with_mode(revs, object, revs->def, mode); add_pending_object_with_mode(revs, object, revs->def, oc.mode);
} }
/* Did the user ask for any diff output? Run the diff! */ /* Did the user ask for any diff output? Run the diff! */

8
sha1_name.c
View File

@ -1139,14 +1139,6 @@ void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
get_sha1_with_context_1(name, sha1, &oc, 1, prefix); get_sha1_with_context_1(name, sha1, &oc, 1, prefix);
} }
int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode)
{
struct object_context oc;
int ret = get_sha1_with_context_1(str, sha1, &oc, 0, NULL);
*mode = oc.mode;
return ret;
}
int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc) int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc)
{ {
return get_sha1_with_context_1(str, sha1, orc, 0, NULL); return get_sha1_with_context_1(str, sha1, orc, 0, NULL);