Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
branch.c: remove the_repository reference
[gitweb.git]
/
builtin
/
notes.c
diff --git
a/builtin/notes.c
b/builtin/notes.c
index c05cd004abcbdcd1e4c3d140f3cf4251c416df36..15a6c78855b4eeb704f1f90d1d0e881656e81a2c 100644
(file)
--- a/
builtin/notes.c
+++ b/
builtin/notes.c
@@
-808,7
+808,7
@@
static int merge(int argc, const char **argv, const char *prefix)
usage_with_options(git_notes_merge_usage, options);
}
- init_notes_merge_options(&o);
+ init_notes_merge_options(
the_repository,
&o);
o.verbosity = verbosity + NOTES_MERGE_VERBOSITY_DEFAULT;
if (do_abort)