combine-diff: better hunk splitting.

diff --git a/rev-list.c b/rev-list.c
index 8020d974f2fc84d477920bd10ea450c44fce0a77..e00e6fc76df8236c925e904fa270a2293099d6cf 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -844,13 +844,18 @@ int main(int argc, const char **argv)
                        arg++;
                        limited = 1;
                }
-               if (get_sha1(arg, sha1) < 0)
+               if (get_sha1(arg, sha1) < 0) {
+                       struct stat st;
+                       if (lstat(arg, &st) < 0)
+                               die("'%s': %s", arg, strerror(errno));
                        break;
+               }
                commit = get_commit_reference(arg, sha1, flags);
                handle_one_commit(commit, &list);
        }
 
-       if (!list)
+       if (!list &&
+           (!(tag_objects||tree_objects||blob_objects) && !pending_objects))
                usage(rev_list_usage);
 
        paths = get_pathspec(prefix, argv + i);