Allow git-svnimport to take "" as the trunk directory.

diff --git a/builtin-diff.c b/builtin-diff.c
index 7f367b6b9d545ea760224fdacb68056261ce1617..8dc17b0dd7af33f83aebeae88d4e616e76da52eb 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -233,6 +233,13 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                        die("diff_setup_done failed");
        }
        rev.diffopt.allow_external = 1;
+       rev.diffopt.recursive = 1;
+
+       /* If the user asked for our exit code then don't start a
+        * pager or we would end up reporting its exit code instead.
+        */
+       if (!rev.diffopt.exit_with_status)
+               setup_pager();
 
        /* Do we have --cached and not have a pending object, then
         * default to HEAD by hand.  Eek.