summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-08-18 11:50:15 -0700
committerJunio C Hamano <gitster@pobox.com>2014-08-18 11:50:15 -0700
commit9eef2c89753895da807c936ff1ba3a255c8370c9 (patch)
tree63216cbe3fba638d7d07602194f8fb9c2d3f636b
parent7484e3b5a0ec4f7afdf4c4609aaed89a67ee712e (diff)
parentd32d37504c4266b3b06d8e7a2fce5f895a29c214 (diff)
downloadgit-9eef2c89753895da807c936ff1ba3a255c8370c9.tar.gz
Merge branch 'rs/strbuf-getcwd' into next
* rs/strbuf-getcwd: fixup! setup: convert setup_git_directory_gently_1 et al. to strbuf
-rw-r--r--setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.c b/setup.c
index 526cdf673f..fb6186049d 100644
--- a/setup.c
+++ b/setup.c
@@ -734,7 +734,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
string_list_clear(&ceiling_dirs, 0);
}
- if (ceil_offset < 0 && has_dos_drive_prefix(cwd))
+ if (ceil_offset < 0 && has_dos_drive_prefix(cwd.buf))
ceil_offset = 1;
/*