diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/ll-merge.c | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/ll-merge.c')
| -rw-r--r-- | third_party/git/ll-merge.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/third_party/git/ll-merge.c b/third_party/git/ll-merge.c index d65a8971db73..5b8d46aedee7 100644 --- a/third_party/git/ll-merge.c +++ b/third_party/git/ll-merge.c @@ -32,20 +32,6 @@ struct ll_merge_driver { char *cmdline; }; -static struct attr_check *merge_attributes; -static struct attr_check *load_merge_attributes(void) -{ - if (!merge_attributes) - merge_attributes = attr_check_initl("merge", "conflict-marker-size", NULL); - return merge_attributes; -} - -void reset_merge_attributes(void) -{ - attr_check_free(merge_attributes); - merge_attributes = NULL; -} - /* * Built-in low-levels */ @@ -368,7 +354,7 @@ int ll_merge(mmbuffer_t *result_buf, struct index_state *istate, const struct ll_merge_options *opts) { - struct attr_check *check = load_merge_attributes(); + static struct attr_check *check; static const struct ll_merge_options default_opts; const char *ll_driver_name = NULL; int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; @@ -383,6 +369,9 @@ int ll_merge(mmbuffer_t *result_buf, normalize_file(theirs, path, istate); } + if (!check) + check = attr_check_initl("merge", "conflict-marker-size", NULL); + git_check_attr(istate, path, check); ll_driver_name = check->items[0].value; if (check->items[1].value) { |