projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch ak/svn
[git.git]
/
rev-parse.c
diff --git
a/rev-parse.c
b/rev-parse.c
index
19a5ef7
..
f176c56
100644
(file)
--- a/
rev-parse.c
+++ b/
rev-parse.c
@@
-172,9
+172,11
@@
int main(int argc, char **argv)
struct stat st;
char *arg = argv[i];
char *dotdot;
struct stat st;
char *arg = argv[i];
char *dotdot;
-
+
if (as_is) {
if (as_is) {
- show_file(arg);
+ if (show_file(arg) && as_is < 2)
+ if (lstat(arg, &st) < 0)
+ die("'%s': %s", arg, strerror(errno));
continue;
}
if (!strcmp(arg,"-n")) {
continue;
}
if (!strcmp(arg,"-n")) {
@@
-194,7
+196,7
@@
int main(int argc, char **argv)
if (*arg == '-') {
if (!strcmp(arg, "--")) {
if (*arg == '-') {
if (!strcmp(arg, "--")) {
- as_is =
1
;
+ as_is =
2
;
/* Pass on the "--" if we show anything but files.. */
if (filter & (DO_FLAGS | DO_REVS))
show_file(arg);
/* Pass on the "--" if we show anything but files.. */
if (filter & (DO_FLAGS | DO_REVS))
show_file(arg);