diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-07 17:02:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-07 17:02:07 -0700 |
| commit | 9673198ee867cea4ed70d2cf54c1a2eb8f27bb46 (patch) | |
| tree | f06a5be02102b0a78f56e18beffa8fa5c3e70b6e /builtin-update-ref.c | |
| parent | 96bc4de85cf810db5c7cd94bf0688a98a64a0bc7 (diff) | |
| parent | 7c49cb288173ab5264b3b9e4257aeeb13388334c (diff) | |
| download | git-9673198ee867cea4ed70d2cf54c1a2eb8f27bb46.tar.gz | |
Merge branch 'master' into pb/gitpm
This is to resolve the conflicts with Ryan's annotate updates early.
Diffstat (limited to 'builtin-update-ref.c')
| -rw-r--r-- | builtin-update-ref.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-update-ref.c b/builtin-update-ref.c index 00333c7e7c..5bd71825fd 100644 --- a/builtin-update-ref.c +++ b/builtin-update-ref.c @@ -5,14 +5,14 @@ static const char git_update_ref_usage[] = "git-update-ref <refname> <value> [<oldval>] [-m <reason>]"; -int cmd_update_ref(int argc, const char **argv, char **envp) +int cmd_update_ref(int argc, const char **argv, const char *prefix) { const char *refname=NULL, *value=NULL, *oldval=NULL, *msg=NULL; struct ref_lock *lock; unsigned char sha1[20], oldsha1[20]; int i; - setup_git_directory(); + setup_ident(); git_config(git_default_config); for (i = 1; i < argc; i++) { |