sha1_name.c: get rid of get_sha1_with_mode_1()
The only external caller is setup.c that tries to give a nicer error message when an object name is misspelt (e.g. "HEAD:cashe.h"). Retire it and give the caller a dedicated and more intuitive API function maybe_die_on_misspelt_object_name(). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 2, 2012 at 11:01 UTC
8c135ea260a84ef71899c8bd23bb39425288f9fe
3 files changed
+20
-15
cache.h
+2
-5
@@ -812,11 +812,8 @@ struct object_context {
812
};
813
814
extern int get_sha1(const char *str, unsigned char *sha1);
815
-extern int get_sha1_with_mode_1(const char *str, unsigned char *sha1, unsigned *mode, int only_to_die, const char *prefix);
816
-static inline int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode)
817
-{
818
- return get_sha1_with_mode_1(str, sha1, mode, 0, NULL);
819
-}
815
+extern int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode);
816
+extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
817
extern int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc);
818
819
/*
setup.c
+2
-6
@@ -55,18 +55,14 @@ int check_filename(const char *prefix, const char *arg)
55
56
static void NORETURN die_verify_filename(const char *prefix, const char *arg)
57
{
58
- unsigned char sha1[20];
59
- unsigned mode;
60
-
58
/*
59
* Saying "'(icase)foo' does not exist in the index" when the
60
* user gave us ":(icase)foo" is just stupid. A magic pathspec
61
* begins with a colon and is followed by a non-alnum; do not
65
- * let get_sha1_with_mode_1(only_to_die=1) to even trigger.
62
+ * let maybe_die_on_misspelt_object_name() even trigger.
63
*/
64
if (!(arg[0] == ':' && !isalnum(arg[1])))
68
- /* try a detailed diagnostic ... */
69
- get_sha1_with_mode_1(arg, sha1, &mode, 1, prefix);
65
+ maybe_die_on_misspelt_object_name(arg, prefix);
66
67
/* ... or fall back the most general message. */
68
die("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
sha1_name.c
+16
-4
@@ -1125,12 +1125,24 @@ static int get_sha1_with_context_1(const char *name, unsigned char *sha1,
1125
return ret;
1126
}
1127
1128
-int get_sha1_with_mode_1(const char *name, unsigned char *sha1, unsigned *mode,
1129
- int only_to_die, const char *prefix)
1128
+/*
1129
+ * Call this function when you know "name" given by the end user must
1130
+ * name an object but it doesn't; the function _may_ die with a better
1131
+ * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not
1132
+ * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case
1133
+ * you have a chance to diagnose the error further.
1134
+ */
1135
+void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
1136
{
1137
struct object_context oc;
1132
- int ret;
1133
- ret = get_sha1_with_context_1(name, sha1, &oc, only_to_die, prefix);
1138
+ unsigned char sha1[20];
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
}