Merge branch 'jn/make-assembly-in-right-directory' into maint

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 3e2f5bd44afb1adee53e554153285f380848c5d9..13495b88f5da1efc2094c0e69abfe93605ee8c03 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -634,6 +634,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
                        if (!strcmp(arg, "--show-prefix")) {
                                if (prefix)
                                        puts(prefix);
+                               else
+                                       putchar('\n');
                                continue;
                        }
                        if (!strcmp(arg, "--show-cdup")) {