diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 20:30:50 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 20:30:50 +0800 |
| commit | b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860 (patch) | |
| tree | da951e1c145cc094a6e5d634141f03b809bf3aff /test-subprocess.c | |
| parent | 01b127cdc5d596a3022d834d82f883822c7f166b (diff) | |
| parent | 868d662399786462f87df45c3d68bd5390311a6e (diff) | |
| download | git-b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860.tar.gz git-b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860.tar.xz | |
Merge maint branch for tracking l10n updates of git stable version
Use master branch to track l10n updates for git next release, while
use maint branch to track l10n updates for git stable version.
Diffstat (limited to 'test-subprocess.c')
| -rw-r--r-- | test-subprocess.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test-subprocess.c b/test-subprocess.c index 8926bc52a..f2d4c0d22 100644 --- a/test-subprocess.c +++ b/test-subprocess.c @@ -1,7 +1,7 @@ #include "cache.h" #include "run-command.h" -int main(int argc, char **argv) +int main(int argc, const char **argv) { struct child_process cp; int nogit = 0; @@ -9,12 +9,12 @@ int main(int argc, char **argv) setup_git_directory_gently(&nogit); if (nogit) die("No git repo found"); - if (!strcmp(argv[1], "--setup-work-tree")) { + if (argc > 1 && !strcmp(argv[1], "--setup-work-tree")) { setup_work_tree(); argv++; } memset(&cp, 0, sizeof(cp)); cp.git_cmd = 1; - cp.argv = (const char **)argv+1; + cp.argv = argv + 1; return run_command(&cp); } |