sha1_name.c: get rid of get_sha1_with_mode()
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>
Junio C Hamano committed
Jul 2, 2012 at 12:56 UTC
249c8f4a164c8502f8274c505a48b9c686f458d0
3 files changed
+6
-15
cache.h
-1
@@ -812,7 +812,6 @@ struct object_context {
812
};
813
814
extern int get_sha1(const char *str, unsigned char *sha1);
815
-extern int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode);
815
extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
816
extern int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc);
817
revision.c
+6
-6
@@ -1097,7 +1097,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs,
1097
int flags,
1098
int cant_be_filename)
1099
{
1100
- unsigned mode;
1100
+ struct object_context oc;
1101
char *dotdot;
1102
struct object *object;
1103
unsigned char sha1[20];
@@ -1180,13 +1180,13 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs,
1180
local_flags = UNINTERESTING;
1181
arg++;
1182
}
1183
- if (get_sha1_with_mode(arg, sha1, &mode))
1183
+ if (get_sha1_with_context(arg, sha1, &oc))
1184
return revs->ignore_missing ? 0 : -1;
1185
if (!cant_be_filename)
1186
verify_non_filename(revs->prefix, arg);
1187
object = get_reference(revs, arg, sha1, flags ^ local_flags);
1188
add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1189
- add_pending_object_with_mode(revs, object, arg, mode);
1189
+ add_pending_object_with_mode(revs, object, arg, oc.mode);
1190
return 0;
1191
}
1192
@@ -1794,11 +1794,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
1794
if (revs->def && !revs->pending.nr && !got_rev_arg) {
1795
unsigned char sha1[20];
1796
struct object *object;
1797
- unsigned mode;
1798
- if (get_sha1_with_mode(revs->def, sha1, &mode))
1797
+ struct object_context oc;
1798
+ if (get_sha1_with_context(revs->def, sha1, &oc))
1799
die("bad default revision '%s'", revs->def);
1800
object = get_reference(revs, revs->def, sha1, 0);
1801
- add_pending_object_with_mode(revs, object, revs->def, mode);
1801
+ add_pending_object_with_mode(revs, object, revs->def, oc.mode);
1802
}
1803
1804
/* Did the user ask for any diff output? Run the diff! */
sha1_name.c
-8
@@ -1139,14 +1139,6 @@ void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
1139
get_sha1_with_context_1(name, sha1, &oc, 1, prefix);
1140
}
1141
1142
-int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode)
1143
-{
1144
- struct object_context oc;
1145
- int ret = get_sha1_with_context_1(str, sha1, &oc, 0, NULL);
1146
- *mode = oc.mode;
1147
- return ret;
1148
-}
1149
-
1142
int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc)
1143
{
1144
return get_sha1_with_context_1(str, sha1, orc, 0, NULL);