diff options
| author | Karthik Nayak <karthik.188@gmail.com> | 2015-03-06 16:48:08 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-06 19:42:00 -0800 |
| commit | 6a536e2076f02a98e0d6403ff68f3acf717fa1c4 (patch) | |
| tree | 5f41839de6e8728f22c86e90f9bfe2e3ae99e328 | |
| parent | 9874fca7122563e28d699a911404fc49d2a24f1c (diff) | |
| download | git-kn/git-cd-to-empty.tar.gz | |
git: treat "git -C '<path>'" as a no-op when <path> is emptykn/git-cd-to-empty
'git -C ""' unhelpfully dies with error "Cannot change to ''",
whereas the shell treats `cd ""' as a no-op. Taking the shell's
behavior as a precedent, teach git to treat `-C ""' as a no-op, as
well.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | git.c | 10 | ||||
| -rwxr-xr-x | t/t0056-git-C.sh | 10 |
2 files changed, 16 insertions, 4 deletions
@@ -204,10 +204,12 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) fprintf(stderr, "No directory given for -C.\n" ); usage(git_usage_string); } - if (chdir((*argv)[1])) - die_errno("Cannot change to '%s'", (*argv)[1]); - if (envchanged) - *envchanged = 1; + if ((*argv)[1][0]) { + if (chdir((*argv)[1])) + die_errno("Cannot change to '%s'", (*argv)[1]); + if (envchanged) + *envchanged = 1; + } (*argv)++; (*argc)--; } else { diff --git a/t/t0056-git-C.sh b/t/t0056-git-C.sh index 99c037703a..2630e756da 100755 --- a/t/t0056-git-C.sh +++ b/t/t0056-git-C.sh @@ -14,6 +14,16 @@ test_expect_success '"git -C <path>" runs git from the directory <path>' ' test_cmp expected actual ' +test_expect_success '"git -C <path>" with an empty <path> is a no-op' ' + ( + mkdir -p dir1/subdir && + cd dir1/subdir && + git -C "" rev-parse --show-prefix >actual && + echo subdir/ >expect && + test_cmp expect actual + ) +' + test_expect_success 'Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2"' ' test_create_repo dir1/dir2 && echo 1 >dir1/dir2/b.txt && |