diff options
| author |  Ross Lagerwall <rosslagerwall@gmail.com> | 2012-04-09 15:27:56 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-04-10 09:25:35 -0700 |
| commit | 658219f1c75e25adbe530a3b681ba3d2332caca6 (patch) | |
| tree | 54dd4f9e3f1cc633dceffccd6bcb96e35fe5f09d | |
| parent | Git 1.7.10 (diff) | |
| download | tgif-658219f1c75e25adbe530a3b681ba3d2332caca6.tar.xz | |
rev-parse --show-prefix: add in trailing newline
Print out a trailing newline when --show-prefix is run with cwd
at the top level of the tree which results in an empty prefix.
Behavior is now like --show-cdup.
Fixes an expected failure in t1501.
Signed-off-by: Ross Lagerwall <rosslagerwall@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/rev-parse.c | 2 | ||||
| -rwxr-xr-x | t/t1501-worktree.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 98d1cbecca..733f626f6c 100644 --- 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")) { diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh index e661147c57..8f36aa9fc4 100755 --- a/t/t1501-worktree.sh +++ b/t/t1501-worktree.sh @@ -68,7 +68,7 @@ test_expect_success 'inside work tree' ' ) ' -test_expect_failure 'empty prefix is actually written out' ' +test_expect_success 'empty prefix is actually written out' ' echo >expected && ( cd work && |