summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-20 20:11:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-20 20:11:46 (GMT)
commitd6c988ddfacd49edf1eb16084af36062d8eb7121 (patch)
treeb87d2882a42979e3823a30e2006c98531c7a82a5 /git.c
parentf57610a1ff7a547d1e11e24f942b1703cea81f81 (diff)
parent6a536e2076f02a98e0d6403ff68f3acf717fa1c4 (diff)
downloadgit-d6c988ddfacd49edf1eb16084af36062d8eb7121.zip
git-d6c988ddfacd49edf1eb16084af36062d8eb7121.tar.gz
git-d6c988ddfacd49edf1eb16084af36062d8eb7121.tar.bz2
Merge branch 'kn/git-cd-to-empty'
"git -C '' subcmd" refused to work in the current directory, unlike "cd ''" which silently behaves as a no-op. * kn/git-cd-to-empty: git: treat "git -C '<path>'" as a no-op when <path> is empty
Diffstat (limited to 'git.c')
-rw-r--r--git.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/git.c b/git.c
index 8b5659b..42a4ee5 100644
--- a/git.c
+++ b/git.c
@@ -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 {