revision.c: allow handle_revision_arg() to take other flags
The existing "cant_be_filename" that tells the function that the caller knows the arg is not a path (hence it does not have to be checked for absense of the file whose name matches it) is made into a bit in the flag word. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 2, 2012 at 12:33 UTC
8e676e8ba567eccee1510b90ec2e0364dcc2f3b4
3 files changed
+10
-8
builtin/pack-objects.c
+1
-1
@@ -2290,7 +2290,7 @@ static void get_object_list(int ac, const char **av)
2290
}
2291
die("not a rev '%s'", line);
2292
}
2293
- if (handle_revision_arg(line, &revs, flags, 1))
2293
+ if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
2294
die("bad revision '%s'", line);
2295
}
2296
revision.c
+7
-6
@@ -1093,9 +1093,7 @@ static void prepare_show_merge(struct rev_info *revs)
1093
revs->limited = 1;
1094
}
1095
1096
-int handle_revision_arg(const char *arg_, struct rev_info *revs,
1097
- int flags,
1098
- int cant_be_filename)
1096
+int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1097
{
1098
struct object_context oc;
1099
char *dotdot;
@@ -1103,6 +1101,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs,
1101
unsigned char sha1[20];
1102
int local_flags;
1103
const char *arg = arg_;
1104
+ int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1105
1106
dotdot = strstr(arg, "..");
1107
if (dotdot) {
@@ -1236,7 +1235,7 @@ static void read_revisions_from_stdin(struct rev_info *revs,
1235
}
1236
die("options not supported in --stdin mode");
1237
}
1239
- if (handle_revision_arg(sb.buf, revs, 0, 1))
1238
+ if (handle_revision_arg(sb.buf, revs, 0, REVARG_CANNOT_BE_FILENAME))
1239
die("bad revision '%s'", sb.buf);
1240
}
1241
if (seen_dashdash)
@@ -1684,7 +1683,7 @@ static int handle_revision_pseudo_opt(const char *submodule,
1683
*/
1684
int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
1685
{
1687
- int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
1686
+ int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
1687
struct cmdline_pathspec prune_data;
1688
const char *submodule = NULL;
1689
@@ -1708,6 +1707,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
1707
1708
/* Second, deal with arguments and options */
1709
flags = 0;
1710
+ revarg_opt = seen_dashdash ? REVARG_CANNOT_BE_FILENAME : 0;
1711
read_from_stdin = 0;
1712
for (left = i = 1; i < argc; i++) {
1713
const char *arg = argv[i];
@@ -1743,7 +1743,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
1743
continue;
1744
}
1745
1746
- if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1746
+
1747
+ if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
1748
int j;
1749
if (seen_dashdash || *arg == '^')
1750
die("bad revision '%s'", arg);
revision.h
+2
-1
@@ -190,7 +190,8 @@ extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, s
190
extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
191
const struct option *options,
192
const char * const usagestr[]);
193
-extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
193
+#define REVARG_CANNOT_BE_FILENAME 01
194
+extern int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt);
195
196
extern int prepare_revision_walk(struct rev_info *revs);
197
extern struct commit *get_revision(struct rev_info *revs);