mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/config-cb'

Browse Source 
* js/config-cb:
  Provide git_config with a callback-data parameter

Conflicts:

	builtin-add.c
	builtin-cat-file.c
This commit is contained in:
Junio C Hamano
2008-05-25 14:25:02 -07:00
parent 450c5aed06 ef90d6d420
commit 9bd81e4249
75 changed files with 179 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
remote.c
View File

@ -298,7 +298,7 @@ static void read_branches_file(struct remote *remote)
remote->fetch_tags = 1; /* always auto-follow */
}
static int handle_config(const char *key, const char *value)
static int handle_config(const char *key, const char *value, void *cb)
{
const char *name;
const char *subkey;
@ -420,7 +420,7 @@ static void read_config(void)
current_branch =
make_branch(head_ref + strlen("refs/heads/"), 0);
}
git_config(handle_config);
git_config(handle_config, NULL);
alias_all_urls();
}