summaryrefslogtreecommitdiff
path: root/notes-merge.c
Commit message (Expand)AuthorAgeFilesLines
* treewide: remove cache.h inclusion due to object-file.h changesElijah Newren2023-04-111-1/+1
* object-file.h: move declarations for object-file.c functions from cache.hElijah Newren2023-04-111-0/+1
* object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
* treewide: be explicit about dependence on advice.hElijah Newren2023-04-111-0/+1
* treewide: be explicit about dependence on trace.h & trace2.hElijah Newren2023-04-111-0/+1
* Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-5/+6
|\
| * cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-2/+3
| * cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
* | wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
* | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-231-0/+1
|/
* misc *.c: use designated initializers for struct assignmentsÆvar Arnfjörð Bjarmason2022-03-171-0/+1
* Merge branch 'ab/diff-free-more'Junio C Hamano2022-02-251-2/+0
|\
| * diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)Ævar Arnfjörð Bjarmason2022-02-161-2/+0
* | ll-merge: make callers responsible for showing warningsElijah Newren2022-02-021-1/+4
|/
* advice: remove read uses of most global `advice_` variablesBen Boeckel2021-08-251-1/+1
* Merge branch 'en/dir-traversal'Junio C Hamano2021-05-201-4/+1
|\
| * dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren2021-05-131-4/+1
* | Merge branch 'js/merge-already-up-to-date-message-reword'Junio C Hamano2021-05-111-1/+1
|\ \
| * | merge(s): apply consistent punctuation to "up to date" messagesEric Sunshine2021-05-031-1/+1
| |/
* | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-1/+1
|/
* use CALLOC_ARRAYRené Scharfe2021-03-131-1/+1
* notes-merge: switch to use the_hash_algobrian m. carlson2019-04-011-3/+3
* notes-utils.c: remove the_repository referencesNguyễn Thái Ngọc Duy2019-01-141-2/+2
* notes-merge.c: remove implicit dependency the_repositoryNguyễn Thái Ngọc Duy2018-11-121-2/+2
* notes-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-121-5/+7
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-4/+5
|\
| * sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| * ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+2
| * diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+2
* | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-12/+12
|\ \
| * | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-12/+12
| |/
* | commit.h: remove method declarationsDerrick Stolee2018-07-201-0/+1
|/
* commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-291-2/+3
* Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-0/+1
|\
| * object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-2/+2
|\ \
| * | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-2/+2
| |/
* | Merge branch 'ds/lazy-load-trees'Junio C Hamano2018-05-231-4/+5
|\ \ | |/ |/|
| * treewide: replace maybe_tree with accessor methodsDerrick Stolee2018-04-111-4/+5
| * treewide: rename tree to maybe_treeDerrick Stolee2018-04-111-4/+4
* | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
|/
* commit: convert commit_tree* to object_idPatryk Obara2018-01-301-5/+4
* Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-1/+1
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-2/+2
|\
| * diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-2/+2
| * diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-2/+2
* | refs: convert read_ref and read_ref_full to object_idbrian m. carlson2017-10-161-1/+1
|/