| 871 | } |
| 872 | |
| 873 | static int git_config_get_notes_strategy(const char *key, |
| 874 | enum notes_merge_strategy *strategy) |
| 875 | { |
| 876 | char *value; |
| 877 | |
| 878 | if (repo_config_get_string(the_repository, key, &value)) |
| 879 | return 1; |
| 880 | if (parse_notes_merge_strategy(value, strategy)) |
| 881 | git_die_config(the_repository, key, _("unknown notes merge strategy %s"), value); |
| 882 | |
| 883 | free(value); |
| 884 | return 0; |
| 885 | } |
| 886 | |
| 887 | static int merge(int argc, const char **argv, const char *prefix, |
| 888 | struct repository *repo UNUSED) |
no test coverage detected