mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-20 06:28:20 +02:00
Code

Merge branch 'maint'

Browse Source 
* maint:
  test-subprocess: fix segfault without arguments
  submodule: fix prototype of gitmodules_config
This commit is contained in:
Junio C Hamano 2012-04-10 12:45:35 -07:00
commit 7945c7fad0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodule.h
View File

@ -13,7 +13,7 @@ enum {
void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
const char *path);
int submodule_config(const char *var, const char *value, void *cb);
void gitmodules_config();
void gitmodules_config(void);
int parse_submodule_config_option(const char *var, const char *value);
void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);

6
test-subprocess.c
View File

@ -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);
}