summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-26 17:08:00 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-26 17:08:00 -0700
commit69bcc43eca0f251617e3b5db5df632b24db94e92 (patch)
treed816d41d36c73f3e665e4a2967a59abef4ce12d3 /revision.c
parent3496277a561307c3d31d2085347af8eb4c667c36 (diff)
parent5981e09999e90b389a02843671529a0faaf72143 (diff)
downloadgit-69bcc43eca0f251617e3b5db5df632b24db94e92.tar.gz
Merge branch 'fix'
* fix: commit-tree.c: check_valid() microoptimization. Fix filename verification when in a subdirectory rebase: typofix. socksetup: don't return on set_reuse_addr() error
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/revision.c b/revision.c
index f9c7d15f56..f2a9f25fe1 100644
--- a/revision.c
+++ b/revision.c
@@ -752,17 +752,15 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
arg++;
}
if (get_sha1(arg, sha1) < 0) {
- struct stat st;
int j;
if (seen_dashdash || local_flags)
die("bad revision '%s'", arg);
/* If we didn't have a "--", all filenames must exist */
- for (j = i; j < argc; j++) {
- if (lstat(argv[j], &st) < 0)
- die("'%s': %s", argv[j], strerror(errno));
- }
+ for (j = i; j < argc; j++)
+ verify_filename(revs->prefix, argv[j]);
+
revs->prune_data = get_pathspec(revs->prefix, argv + i);
break;
}