diff options
| author | Gary V. Vaughan <git@mlists.thewrittenword.com> | 2010-05-14 09:31:33 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-31 16:59:26 -0700 |
| commit | 66dbfd55e38128db02eb340fcd89f54b734d4c6e (patch) | |
| tree | 115937b86083814adcc97bc55424720e96da5f72 /builtin/add.c | |
| parent | ebef82776512f56eec4b6ac98b076369eb5a93fa (diff) | |
| download | git-66dbfd55e38128db02eb340fcd89f54b734d4c6e.tar.gz git-66dbfd55e38128db02eb340fcd89f54b734d4c6e.tar.xz | |
Rewrite dynamic structure initializations to runtime assignment
Unfortunately, there are still plenty of production systems with
vendor compilers that choke unless all compound declarations can be
determined statically at compile time, for example hpux10.20 (I can
provide a comprehensive list of our supported platforms that exhibit
this problem if necessary).
This patch simply breaks apart any compound declarations with dynamic
initialisation expressions, and moves the initialisation until after
the last declaration in the same block, in all the places necessary to
have the offending compilers accept the code.
Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c index 87d298031..17149cfee 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -261,12 +261,14 @@ static int edit_patch(int argc, const char **argv, const char *prefix) { char *file = xstrdup(git_path("ADD_EDIT.patch")); const char *apply_argv[] = { "apply", "--recount", "--cached", - file, NULL }; + NULL, NULL }; struct child_process child; struct rev_info rev; int out; struct stat st; + apply_argv[3] = file; + git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ if (read_cache() < 0) |