diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-26 23:44:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-26 23:44:14 -0800 |
| commit | d93067d9c7fb210766c7282d662289f54d53f93a (patch) | |
| tree | a463ad3ce94a987ec3d00e10eaa98ede1fe0495d /revision.c | |
| parent | f4e96f97e85c145616bc2e23e9441bc0daa2906e (diff) | |
| parent | b0a3de42316a4e8f1d561cbe12b7bb282631a0d6 (diff) | |
| download | git-d93067d9c7fb210766c7282d662289f54d53f93a.tar.gz | |
Merge branch 'master' into next
* master:
Optionally do not list empty directories in git-ls-files --others
Document git-rebase behavior on conflicts.
Fix error handling for nonexistent names
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 12cd0529a5..d67718c75b 100644 --- a/revision.c +++ b/revision.c @@ -649,7 +649,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch /* 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", arg, strerror(errno)); + die("'%s': %s", argv[j], strerror(errno)); } revs->prune_data = get_pathspec(revs->prefix, argv + i); break; |