aboutsummaryrefslogtreecommitdiffstats
path: root/notes-merge.c
AgeCommit message (Expand)AuthorFilesLines
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-1/+2
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1
2023-06-21merge-ll: rename from ll-mergeElijah Newren1-1/+1
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-04-11treewide: remove cache.h inclusion due to object-file.h changesElijah Newren1-1/+1
2023-04-11object-file.h: move declarations for object-file.c functions from cache.hElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on trace.h & trace2.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-5/+6
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+3
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2022-03-17misc *.c: use designated initializers for struct assignmentsÆvar Arnfjörð Bjarmason1-0/+1
2022-02-25Merge branch 'ab/diff-free-more'Junio C Hamano1-2/+0
2022-02-16diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)Ævar Arnfjörð Bjarmason1-2/+0
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren1-1/+4
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel1-1/+1
2021-05-20Merge branch 'en/dir-traversal'Junio C Hamano1-4/+1
2021-05-13dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren1-4/+1
2021-05-11Merge branch 'js/merge-already-up-to-date-message-reword'Junio C Hamano1-1/+1
2021-05-03merge(s): apply consistent punctuation to "up to date" messagesEric Sunshine1-1/+1
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-1/+1
2021-03-13use CALLOC_ARRAYRené Scharfe1-1/+1
2019-04-01notes-merge: switch to use the_hash_algobrian m. carlson1-3/+3
2019-01-14notes-utils.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-2/+2
2018-11-12notes-merge.c: remove implicit dependency the_repositoryNguyễn Thái Ngọc Duy1-2/+2
2018-11-12notes-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-5/+7
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-4/+5
2018-09-21sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+2
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-2/+2
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-12/+12
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-12/+12
2018-07-20commit.h: remove method declarationsDerrick Stolee1-0/+1
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller1-2/+3
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-0/+1
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano1-2/+2
2018-05-23Merge branch 'ds/lazy-load-trees'Junio C Hamano1-4/+5
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin1-2/+2
2018-04-11treewide: replace maybe_tree with accessor methodsDerrick Stolee1-4/+5
2018-04-11treewide: rename tree to maybe_treeDerrick Stolee1-4/+4
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson1-1/+1
2018-01-30commit: convert commit_tree* to object_idPatryk Obara1-5/+4
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-2/+2
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams1-2/+2
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams1-2/+2
2017-10-16refs: convert read_ref and read_ref_full to object_idbrian m. carlson1-1/+1
2017-09-26notes-merge: drop dead zero-write codeJeff King1-2/+0
2017-09-25Merge branch 'jk/write-in-full-fix'Junio C Hamano1-1/+1
2017-09-14notes-merge: use ssize_t for write_in_full() return valueJeff King1-1/+1
2017-09-10Merge branch 'ma/up-to-date'Junio C Hamano1-1/+1
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren1-1/+1
2017-08-20sha1_file: convert index_path to struct object_idPatryk Obara1-1/+1
2017-07-17use MOVE_ARRAYRené Scharfe1-2/+1
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams1-2/+2
2017-06-05notes-merge: convert write_note_to_worktree to struct object_idBrandon Williams1-10/+10
2017-06-05notes-merge: convert verify_notes_filepair to struct object_idBrandon Williams1-10/+10
2017-06-05notes-merge: convert find_notes_merge_pair_ps to struct object_idBrandon Williams1-12/+12
2017-06-05notes-merge: convert merge_from_diffs to struct object_idBrandon Williams1-15/+16
2017-06-05notes-merge: convert notes_merge* to struct object_idBrandon Williams1-29/+29
2017-06-02notes: convert some accessor functions to struct object_idbrian m. carlson1-9/+9
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-2/+2
2017-05-08Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson1-13/+13
2017-04-20replace strbuf_addstr(git_path()) with git_path_buf()Jeff King1-2/+2
2016-09-26Merge branch 'va/i18n-more'Junio C Hamano1-4/+4
2016-09-21i18n: notes-merge: mark die messages for translationVasco Almeida1-4/+4
2016-09-07Convert read_mmblob to take struct object_id.brian m. carlson1-3/+3
2016-09-07notes-merge: convert struct notes_merge_pair to struct object_idbrian m. carlson1-62/+65
2016-07-28Merge branch 'rs/notes-merge-no-toctou'Junio C Hamano1-5/+1
2016-07-19Merge branch 'bc/cocci'Junio C Hamano1-21/+21
2016-07-07notes-merge: use O_EXCL to avoid overwriting existing filesRené Scharfe1-5/+1
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson1-21/+21
2016-06-02pathspec: rename free_pathspec() to clear_pathspec()Junio C Hamano1-2/+2
2015-11-20Remove get_object_hash.brian m. carlson1-10/+10
2015-11-20Convert struct object to object_idbrian m. carlson1-2/+2
2015-11-20Add several uses of get_object_hash.brian m. carlson1-10/+10
2015-08-10prefer git_pathdup to git_path in some possibly-dangerous casesJeff King1-1/+2
2015-05-11Merge branch 'nd/multiple-work-trees'Junio C Hamano1-3/+3
2015-01-07Merge branch 'jc/merge-bases'Junio C Hamano1-1/+1
2014-12-01path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy1-3/+3
2014-10-30get_merge_bases(): always clean-up object flagsJunio C Hamano1-1/+1
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg1-1/+1
2014-06-13commit: record buffer length in cacheJeff King1-1/+1
2014-06-13use get_commit_buffer everywhereJeff King1-1/+3
2014-06-12replace dangerous uses of strbuf_attachJeff King1-4/+1
2014-06-12commit_tree: take a pointer/len pair rather than a const strbufJeff King1-2/+4
2013-07-15remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy1-2/+2
2013-06-12Move create_notes_commit() from notes-merge.c into notes-utils.cJohan Herland1-26/+1
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano1-4/+2
2012-08-03diff_setup_done(): return voidThomas Rast1-4/+2
2012-06-07notes-merge: remove i18n legos in merge result messageNguyễn Thái Ngọc Duy1-2/+4
2012-03-15notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdJohan Herland1-4/+9
2012-03-15notes-merge: use opendir/readdir instead of using read_directory()Johan Herland1-20/+30
2012-01-06Merge branch 'jc/show-sig'Junio C Hamano1-1/+1
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano1-4/+6
2011-12-15Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy1-4/+6
2011-12-09Merge branch 'nd/resolve-ref'Junio C Hamano1-1/+1
2011-11-18Sync with 1.7.7.4Junio C Hamano1-43/+61
2011-11-18Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano1-43/+61
2011-11-17notes merge: eliminate OUTPUT macroJonathan Nieder1-43/+61
2011-11-13Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy1-1/+1
2011-11-12commit: teach --gpg-sign optionJunio C Hamano1-1/+1
2011-10-10Merge branch 'mh/maint-notes-merge-pathbuf-fix'Junio C Hamano1-1/+2
2011-10-05Change check_ref_format() to take a flags argumentMichael Haggerty1-2/+3
2011-09-27notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty1-1/+2
2011-05-09index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano1-1/+1
2011-03-22Fix sparse warningsStephen Boyd1-1/+1
2011-02-14correct type of EMPTY_TREE_SHA1_BINJonathan Nieder1-1/+1
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland1-0/+7
2010-11-17git notes merge: List conflicting notes in notes merge commit messageJohan Herland1-1/+10
2010-11-17git notes merge: Manual conflict resolution, part 2/2Johan Herland1-1/+70
2010-11-17git notes merge: Manual conflict resolution, part 1/2Johan Herland1-5/+161
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland1-1/+31
2010-11-17git notes merge: Handle real, non-conflicting notes mergesJohan Herland1-3/+322
2010-11-17builtin/notes.c: Refactor creation of notes commits.Johan Herland1-0/+27
2010-11-17git notes merge: Initial implementation handling trivial merges onlyJohan Herland1-0/+120
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 13:04:36 +0000