diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-06 14:34:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-06 14:34:43 -0800 |
| commit | 152a9c17a802379a3a48e025b74dedd76e2623cc (patch) | |
| tree | 35adf01f3da51119a475392076d1cb290b800a00 /setup.c | |
| parent | f26f72de159d7ade2fbe8b48734ce98c1aba4d72 (diff) | |
| parent | abf03eeb8e99538cd31806d5f252214b9fe695a6 (diff) | |
| download | git-152a9c17a802379a3a48e025b74dedd76e2623cc.tar.gz | |
Merge branch 'fc/trivial'
A random collection of style fixes and minor doc updates.
* fc/trivial:
setup: trivial style fixes
run-command: trivial style fixes
diff: trivial style fix
revision: trivial style fixes
pretty: trivial style fix
describe: trivial style fixes
transport-helper: trivial style fix
sha1-name: trivial style cleanup
branch: trivial style fix
revision: add missing include
doc/pull: clarify the illustrations
t: replace pulls with merges
merge: simplify ff-only option
Diffstat (limited to 'setup.c')
| -rw-r--r-- | setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -563,7 +563,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok) { const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT); struct string_list ceiling_dirs = STRING_LIST_INIT_DUP; - static char cwd[PATH_MAX+1]; + static char cwd[PATH_MAX + 1]; const char *gitdirenv, *ret; char *gitfile; int len, offset, offset_parent, ceil_offset = -1; @@ -578,7 +578,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok) if (nongit_ok) *nongit_ok = 0; - if (!getcwd(cwd, sizeof(cwd)-1)) + if (!getcwd(cwd, sizeof(cwd) - 1)) die_errno("Unable to read current working directory"); offset = len = strlen(cwd); |