summaryrefslogtreecommitdiffstats
path: root/notes-merge.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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 lowercaseBrandon 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
|/
* notes-merge: drop dead zero-write codeJeff King2017-09-261-2/+0
* Merge branch 'jk/write-in-full-fix'Junio C Hamano2017-09-251-1/+1
|\
| * notes-merge: use ssize_t for write_in_full() return valueJeff King2017-09-141-1/+1
* | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-101-1/+1
|\ \
| * | treewide: correct several "up-to-date" to "up to date"Martin Ågren2017-08-231-1/+1
* | | sha1_file: convert index_path to struct object_idPatryk Obara2017-08-211-1/+1
| |/ |/|
* | use MOVE_ARRAYRené Scharfe2017-07-171-2/+1
|/
* diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-051-2/+2
* notes-merge: convert write_note_to_worktree to struct object_idBrandon Williams2017-06-051-10/+10
* notes-merge: convert verify_notes_filepair to struct object_idBrandon Williams2017-06-051-10/+10
* notes-merge: convert find_notes_merge_pair_ps to struct object_idBrandon Williams2017-06-051-12/+12
* notes-merge: convert merge_from_diffs to struct object_idBrandon Williams2017-06-051-15/+16
* notes-merge: convert notes_merge* to struct object_idBrandon Williams2017-06-051-29/+29
* notes: convert some accessor functions to struct object_idbrian m. carlson2017-06-021-9/+9
* Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-2/+2
* Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson2017-05-081-13/+13
* replace strbuf_addstr(git_path()) with git_path_buf()Jeff King2017-04-211-2/+2
* Merge branch 'va/i18n-more'Junio C Hamano2016-09-271-4/+4
|\
| * i18n: notes-merge: mark die messages for translationVasco Almeida2016-09-211-4/+4
* | Convert read_mmblob to take struct object_id.brian m. carlson2016-09-071-3/+3
* | notes-merge: convert struct notes_merge_pair to struct object_idbrian m. carlson2016-09-071-62/+65
|/
* Merge branch 'rs/notes-merge-no-toctou'Junio C Hamano2016-07-281-5/+1
|\
| * notes-merge: use O_EXCL to avoid overwriting existing filesRené Scharfe2016-07-071-5/+1
* | Merge branch 'bc/cocci'Junio C Hamano2016-07-191-21/+21
|\ \
| * | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-281-21/+21
| |/
* / pathspec: rename free_pathspec() to clear_pathspec()Junio C Hamano2016-06-021-2/+2
|/
* Remove get_object_hash.brian m. carlson2015-11-201-10/+10
* Convert struct object to object_idbrian m. carlson2015-11-201-2/+2
* Add several uses of get_object_hash.brian m. carlson2015-11-201-10/+10
* prefer git_pathdup to git_path in some possibly-dangerous casesJeff King2015-08-111-1/+2
* Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-111-3/+3
|\
| * path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy2014-12-011-3/+3
* | Merge branch 'jc/merge-bases'Junio C Hamano2015-01-071-1/+1
|\ \ | |/ |/|
| * get_merge_bases(): always clean-up object flagsJunio C Hamano2014-10-301-1/+1
* | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-1/+1
|/
* commit: record buffer length in cacheJeff King2014-06-131-1/+1
* use get_commit_buffer everywhereJeff King2014-06-131-1/+3
* replace dangerous uses of strbuf_attachJeff King2014-06-121-4/+1
* commit_tree: take a pointer/len pair rather than a const strbufJeff King2014-06-121-2/+4
* remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy2013-07-151-2/+2
* Move create_notes_commit() from notes-merge.c into notes-utils.cJohan Herland2013-06-121-26/+1
* Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-221-4/+2
|\
| * diff_setup_done(): return voidThomas Rast2012-08-031-4/+2
* | notes-merge: remove i18n legos in merge result messageNguyễn Thái Ngọc Duy2012-06-071-2/+4
* | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdJohan Herland2012-03-151-4/+9
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 13:55:04 +0100