revision parsing: make "rev -- paths" checks stronger.
If you don't have a "--" marker, then: - all of the arguments we are going to assume are pathspecs must exist in the working tree. - none of the arguments we parsed as revisions could be interpreted as a filename. so that there really isn't any possibility of confusion in case somebody does have a revision that looks like a pathname too. The former rule has been in effect; this implements the latter. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Apr 26, 2006 at 15:09 UTC
ea92f41ff92b2fef54c8da4abb03c8101160a034
3 files changed
+36
-3
cache.h
+1
@@ -135,6 +135,7 @@ extern const char *setup_git_directory(void);
135
extern const char *prefix_path(const char *prefix, int len, const char *path);
136
extern const char *prefix_filename(const char *prefix, int len, const char *path);
137
extern void verify_filename(const char *prefix, const char *name);
138
+extern void verify_non_filename(const char *prefix, const char *name);
139
140
#define alloc_nr(x) (((x)+16)*3/2)
141
revision.c
+13
-1
@@ -740,6 +740,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
740
include = get_reference(revs, next, sha1, flags);
741
if (!exclude || !include)
742
die("Invalid revision range %s..%s", arg, next);
743
+
744
+ if (!seen_dashdash) {
745
+ *dotdot = '.';
746
+ verify_non_filename(revs->prefix, arg);
747
+ }
748
add_pending_object(revs, exclude, this);
749
add_pending_object(revs, include, next);
750
continue;
@@ -757,13 +762,20 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
762
if (seen_dashdash || local_flags)
763
die("bad revision '%s'", arg);
764
760
- /* If we didn't have a "--", all filenames must exist */
765
+ /* If we didn't have a "--":
766
+ * (1) all filenames must exist;
767
+ * (2) all rev-args must not be interpretable
768
+ * as a valid filename.
769
+ * but the latter we have checked in the main loop.
770
+ */
771
for (j = i; j < argc; j++)
772
verify_filename(revs->prefix, argv[j]);
773
774
revs->prune_data = get_pathspec(revs->prefix, argv + i);
775
break;
776
}
777
+ if (!seen_dashdash)
778
+ verify_non_filename(revs->prefix, arg);
779
object = get_reference(revs, arg, sha1, flags ^ local_flags);
780
add_pending_object(revs, object, arg);
781
}
setup.c
+22
-2
@@ -80,11 +80,31 @@ void verify_filename(const char *prefix, const char *arg)
80
if (!lstat(name, &st))
81
return;
82
if (errno == ENOENT)
83
- die("ambiguous argument '%s': unknown revision or filename\n"
84
- "Use '--' to separate filenames from revisions", arg);
83
+ die("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
84
+ "Use '--' to separate paths from revisions", arg);
85
die("'%s': %s", arg, strerror(errno));
86
}
87
88
+/*
89
+ * Opposite of the above: the command line did not have -- marker
90
+ * and we parsed the arg as a refname. It should not be interpretable
91
+ * as a filename.
92
+ */
93
+void verify_non_filename(const char *prefix, const char *arg)
94
+{
95
+ const char *name;
96
+ struct stat st;
97
+
98
+ if (*arg == '-')
99
+ return; /* flag */
100
+ name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg;
101
+ if (!lstat(name, &st))
102
+ die("ambiguous argument '%s': both revision and filename\n"
103
+ "Use '--' to separate filenames from revisions", arg);
104
+ if (errno != ENOENT)
105
+ die("'%s': %s", arg, strerror(errno));
106
+}
107
+
108
const char **get_pathspec(const char *prefix, const char **pathspec)
109
{
110
const char *entry = *pathspec;