summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-16 11:09:31 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-16 12:47:15 -0800
commita1bb8f45f1590f812badceea0b7c120074ec3e85 (patch)
tree3ce41a927bcca4baa26680cc33c79aa15fdc4795 /setup.c
parente25e2b4201716a912b29397515a858238497dbdd (diff)
parent527b9d704d929a2fff2f9bf1c5e2856725c1416d (diff)
downloadgit-a1bb8f45f1590f812badceea0b7c120074ec3e85.tar.gz
Merge branch 'maint' to sync with 1.6.5.7
* maint: Git 1.6.5.7 worktree: don't segfault with an absolute pathspec without a work tree ignore unknown color configuration help.autocorrect: do not run a command if the command given is junk Illustrate "filter" attribute with an example
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/setup.c b/setup.c
index f67250b7c1..2cf0f19937 100644
--- a/setup.c
+++ b/setup.c
@@ -18,9 +18,12 @@ const char *prefix_path(const char *prefix, int len, const char *path)
if (normalize_path_copy(sanitized, sanitized))
goto error_out;
if (is_absolute_path(orig)) {
+ size_t len, total;
const char *work_tree = get_git_work_tree();
- size_t len = strlen(work_tree);
- size_t total = strlen(sanitized) + 1;
+ if (!work_tree)
+ goto error_out;
+ len = strlen(work_tree);
+ total = strlen(sanitized) + 1;
if (strncmp(sanitized, work_tree, len) ||
(sanitized[len] != '\0' && sanitized[len] != '/')) {
error_out: