aboutsummaryrefslogtreecommitdiffstats
path: root/notes-utils.c
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2023-05-16 10:19:48 +0800
committerJiang Xin <worldhello.net@gmail.com>2023-05-16 10:19:48 +0800
commit03d05937a70900819a5a73583a96bcb1fd06eb68 (patch)
treed952758a83872e5da54abd45fc8463037fb329ee /notes-utils.c
parentl10n: TEAMS: Update pt_PT repo link (diff)
parentGit 2.41-rc0 (diff)
downloadgit-03d05937a70900819a5a73583a96bcb1fd06eb68.tar.gz
git-03d05937a70900819a5a73583a96bcb1fd06eb68.zip
Merge tag 'v2.41.0-rc0'
Git 2.41-rc0 * tag 'v2.41.0-rc0': (508 commits) Git 2.41-rc0 t5583: fix shebang line merge-tree: load default git config fetch: introduce machine-parseable "porcelain" output format fetch: move option related variables into main function fetch: lift up parsing of "fetch.output" config variable fetch: introduce `display_format` enum fetch: refactor calculation of the display table width fetch: print left-hand side when fetching HEAD:foo fetch: add a test to exercise invalid output formats fetch: split out tests for output format fetch: fix `--no-recurse-submodules` with multi-remote fetches The eighteenth batch The seventeenth batch diff-files: integrate with sparse index t1092: add tests for `git diff-files` test: rev-parse-upstream: add missing cmp t: drop "verbose" helper function t7001: use "ls-files --format" instead of "cut" t7001: avoid git on upstream of pipe ...
Diffstat (limited to 'notes-utils.c')
-rw-r--r--notes-utils.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/notes-utils.c b/notes-utils.c
index d7d18e30f5..4a793eb347 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -1,9 +1,12 @@
-#include "cache.h"
+#include "git-compat-util.h"
#include "config.h"
#include "commit.h"
+#include "environment.h"
+#include "gettext.h"
#include "refs.h"
#include "notes-utils.h"
#include "repository.h"
+#include "strbuf.h"
void create_notes_commit(struct repository *r,
struct notes_tree *t,
@@ -23,7 +26,7 @@ void create_notes_commit(struct repository *r,
struct object_id parent_oid;
if (!read_ref(t->ref, &parent_oid)) {
struct commit *parent = lookup_commit(r, &parent_oid);
- if (parse_commit(parent))
+ if (repo_parse_commit(r, parent))
die("Failed to find/parse commit %s", t->ref);
commit_list_insert(parent, &parents);
}