aboutsummaryrefslogtreecommitdiffstats
path: root/rerere.c
AgeCommit message (Expand)AuthorFilesLines
6 daysMerge branch 'mr/rerere-crash-fix'Junio C Hamano1-0/+5
13 daysrerere: fix crashes due to unmatched opening conflict markersMarcel Röthke1-0/+5
2024-02-14Merge branch 'js/check-null-from-read-object-file'Junio C Hamano1-0/+3
2024-02-06Always check the return value of `repo_read_object_file()`Johannes Schindelin1-0/+3
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-2/+0
2023-10-02Merge branch 'jc/unresolve-removal'Junio C Hamano1-1/+1
2023-08-04Merge branch 'jc/retire-get-sha1-hex'Junio C Hamano1-1/+1
2023-07-31checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano1-1/+1
2023-07-24hex: retire get_sha1_hex()Junio C Hamano1-1/+1
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan1-1/+0
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-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+1
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren1-0/+1
2023-04-24copy.h: move declarations for copy.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: reduce includes of cache.h in other headersElijah Newren1-1/+1
2023-04-11object-file.h: move declarations for object-file.c functions from cache.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-2/+3
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+3
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren1-0/+1
2023-03-21abspath.h: move absolute path 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
2023-02-23alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren1-1/+2
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano1-1/+1
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano1-1/+1
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren1-4/+5
2021-05-13dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren1-3/+1
2021-01-28rerere: use strmap to store rerere directoriesJeff King1-39/+23
2021-01-28rerere: tighten rr-cache dirname checkJeff King1-2/+3
2021-01-28rerere: check dirname format while iterating rr_cache directoryJeff King1-3/+11
2021-01-04hash-lookup: rename from sha1-lookupMartin Ågren1-1/+1
2021-01-04sha1-lookup: rename `sha1_pos()` as `hash_pos()`Martin Ågren1-1/+1
2019-11-10Fix spelling errors in code commentsElijah Newren1-1/+1
2019-08-19rerere: replace sha1_to_hexbrian m. carlson1-4/+4
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy1-3/+3
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy1-1/+1
2018-11-12rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-13/+13
2018-10-30Merge branch 'bc/hash-transition-part-15'Junio C Hamano1-41/+44
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-55/+66
2018-10-15rerere: convert to use the_hash_algobrian m. carlson1-39/+42
2018-09-24Merge branch 'en/rerere-multi-stage-1-fix'Junio C Hamano1-1/+1
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-55/+64
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-4/+6
2018-09-17Merge branch 'tg/rerere'Junio C Hamano1-127/+116
2018-09-11rerere: avoid buffer overrunElijah Newren1-1/+1
2018-08-13dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy1-1/+1
2018-08-06rerere: recalculate conflict ID when unresolved conflict is committedThomas Gummerer1-4/+3
2018-08-06rerere: teach rerere to handle nested conflictsThomas Gummerer1-2/+8
2018-08-06rerere: return strbuf from handle pathThomas Gummerer1-40/+18
2018-08-06rerere: factor out handle_conflict functionThomas Gummerer1-40/+47
2018-08-06rerere: only return whether a path has conflicts or notThomas Gummerer1-11/+12
2018-08-06rerere: fix crash with files rerere can't handleThomas Gummerer1-5/+7
2018-08-06rerere: add documentation for conflict normalizationThomas Gummerer1-4/+0
2018-08-06rerere: mark strings for translationThomas Gummerer1-34/+34
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-3/+5
2018-07-16rerere: wrap paths in output in sqThomas Gummerer1-13/+13
2018-07-16rerere: lowercase error messagesThomas Gummerer1-12/+12
2018-07-16rerere: unify error messages when read_cache failsThomas Gummerer1-3/+3
2018-05-30Merge branch 'ma/lockfile-cleanup'Junio C Hamano1-2/+1
2018-05-18path.c: migrate global git_path_* to take a repository argumentStefan Beller1-3/+4
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-05-10lock_file: move static locks into functionsMartin Ågren1-2/+1
2018-04-10Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson1-2/+2
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren1-5/+3
2018-01-22Use MOVE_ARRAYSZEDER Gábor1-2/+2
2017-09-25Merge branch 'jk/write-in-full-fix'Junio C Hamano1-1/+1
2017-09-14avoid "write_in_full(fd, buf, len) != len" patternJeff King1-1/+1
2017-08-22rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedJunio C Hamano1-12/+2
2017-08-22rerere: represent time duration in timestamp_t internallyJunio C Hamano1-13/+23
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano1-2/+1
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-16*.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason1-2/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-05-26rerere.c: move error_errno() closer to the source system callNguyễn Thái Ngọc Duy1-1/+2
2017-05-26print errno when reporting a system call errorNguyễn Thái Ngọc Duy1-2/+2
2017-05-26wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy1-1/+1
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano1-1/+1
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson1-1/+2
2016-05-23Merge branch 'jc/rerere-multi'Junio C Hamano1-8/+17
2016-05-19rerere: remove an null statementJunio C Hamano1-1/+1
2016-05-17Merge branch 'nd/error-errno'Junio C Hamano1-11/+7
2016-05-11rerere: plug memory leaks upon "rerere forget" failureJunio C Hamano1-8/+17
2016-05-09rerere.c: use error_errno() and warning_errno()Nguyễn Thái Ngọc Duy1-11/+7
2016-04-25Merge branch 'jc/rerere-multi'Junio C Hamano1-194/+432
2016-04-06rerere: adjust 'forget' to multi-variant world orderJunio C Hamano1-1/+27
2016-04-06rerere: split code to call ll_merge() furtherJunio C Hamano1-16/+31
2016-04-06rerere: move code related to "forget" togetherJunio C Hamano1-97/+97
2016-04-06rerere: gc and clearJunio C Hamano1-39/+48
2016-03-15rerere: do use multiple variantsJunio C Hamano1-38/+60
2016-03-15rerere: allow multiple variants to existJunio C Hamano1-22/+105
2016-03-15rerere: delay the recording of preimageJunio C Hamano1-27/+25
2016-03-15rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano1-17/+25
2016-02-17Merge branch 'jk/rerere-xsnprintf'Junio C Hamano1-2/+2
2016-02-08rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_idJunio C Hamano1-3/+29
2016-02-08rerere: split conflict ID furtherJunio C Hamano1-5/+56
2016-02-08rerere: replace strcpy with xsnprintfJeff King1-2/+2
2015-10-05Merge branch 'jc/rerere'Junio C Hamano1-151/+404
2015-09-01rerere: release lockfile in non-writing functionsJeff King1-2/+15
2015-08-10memoize common git-path "constant" filesJeff King1-11/+8
2015-07-24rerere: un-nest merge() furtherJunio C Hamano1-24/+26
2015-07-24rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano1-26/+73
2015-07-24rerere: call conflict-ids IDsJunio C Hamano1-38/+38
2015-07-24rerere: further clarify do_rerere_one_path()Junio C Hamano1-9/+6
2015-07-24rerere: further de-dent do_plain_rerere()Junio C Hamano1-32/+33
2015-07-24rerere: refactor "replay" part of do_plain_rerere()Junio C Hamano1-35/+40
2015-07-24rerere: explain the remainderJunio C Hamano1-0/+20
2015-07-24rerere: explain "rerere forget" codepathJunio C Hamano1-0/+24
2015-07-24rerere: explain the primary codepathJunio C Hamano1-13/+82
2015-07-24rerere: explain MERGE_RR management helpersJunio C Hamano1-0/+41
2015-07-24rerere: fix benign off-by-one non-bug and clarify codeJunio C Hamano1-1/+8
2015-07-24rerere: explain the rerere I/O abstractionJunio C Hamano1-7/+31
2015-07-24rerere: do not leak mmfile[] for a path with multiple stage #1 entriesJunio C Hamano1-2/+4
2015-07-24rerere: stop looping unnecessarilyJunio C Hamano1-10/+7
2015-07-24rerere: drop want_sp parameter from is_cmarker()Junio C Hamano1-5/+22
2015-07-24rerere: report autoupdated paths only after actually updating themJunio C Hamano1-10/+12
2015-07-24rerere: write out each record of MERGE_RR in one goJunio C Hamano1-7/+9
2015-07-24rerere: lift PATH_MAX limitationJunio C Hamano1-20/+15
2015-07-24rerere: plug conflict ID leaksJunio C Hamano1-2/+5
2015-07-24rerere: handle conflicts with multiple stage #1 entriesJunio C Hamano1-1/+1
2015-06-28rerere: fix an off-by-one non-bugJunio C Hamano1-4/+2
2015-05-26Merge branch 'jk/rerere-forget-check-enabled'Junio C Hamano1-0/+2
2015-05-14rerere: exit silently on "forget" when rerere is disabledJeff King1-0/+2
2015-02-24Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintJunio C Hamano1-10/+6
2015-02-11Merge branch 'jn/rerere-fail-on-auto-update-failure'Junio C Hamano1-10/+6
2015-01-08rerere: error out on autoupdate failureJonathan Nieder1-10/+6
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty1-0/+1
2014-08-07rerere.c: replace `git_config()` with `git_config_get_*()` familyTanay Abhra1-31/+12
2014-07-16Merge branch 'rs/code-cleaning'Junio C Hamano1-2/+2
2014-07-10use strbuf_addbuf for adding strbufsRené Scharfe1-2/+2
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy1-2/+1
2014-02-24pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy1-1/+1
2014-02-24pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy1-2/+2
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-3/+4
2013-07-15convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy1-1/+1
2013-07-15rerere: convert to use parse_pathspecNguyễn Thái Ngọc Duy1-4/+5
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy1-6/+6
2013-04-04rerere forget: do not segfault if not all stages are presentJohannes Sixt1-8/+7
2013-04-02rerere forget: grok files containing NULJohannes Sixt1-2/+4
2012-09-15rerere.c: mark private file-scope symbols as staticJunio C Hamano1-1/+1
2012-07-15Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano1-1/+1
2012-07-09rerere: make rr-cache fanout directory honor umaskJunio C Hamano1-1/+1
2012-06-07rerere: remove i18n legos in result messageNguyễn Thái Ngọc Duy1-6/+6
2011-05-30Merge branch 'maint'Junio C Hamano1-2/+8
2011-05-30Merge branch 'jm/maint-misc-fix' into maintJunio C Hamano1-2/+8
2011-05-26plug a DIR buffer leak in rerere.cJim Meyering1-0/+1
2011-05-26rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Jim Meyering1-2/+8
2011-05-08rerere: libify rerere_clear() and rerere_gc()Junio C Hamano1-0/+84
2011-04-03sparse: Fix errors and silence warningsStephen Boyd1-1/+1
2011-03-26Merge branch 'jc/maint-rerere-in-workdir'Junio C Hamano1-2/+1
2011-03-23rerere: make sure it works even in a workdir attached to a young repositoryJunio C Hamano1-2/+1
2011-02-16rerere "remaining"Martin von Zweigbergk1-10/+68
2010-10-26Merge branch 'jf/merge-ignore-ws'Junio C Hamano1-1/+1
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano1-0/+4
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano1-1/+7
2010-08-26ll-merge: replace flag argument with options structJonathan Nieder1-1/+1
2010-08-06rerere: never renormalizeJonathan Nieder1-6/+5
2010-08-06ll-merge: let caller decide whether to renormalizeJonathan Nieder1-5/+10
2010-07-14rerere: fix overeager gcSZEDER Gábor1-1/+7
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina1-5/+5
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano1-5/+5
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips1-5/+5
2010-05-31enums: omit trailing comma for portabilityGary V. Vaughan1-1/+1
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder1-2/+2
2010-02-23rerere: fix memory leak if rerere images can't be readBert Wesarg1-3/+6
2010-01-28rerere: fix too-short initializationJeff King1-1/+1
2010-01-20Merge branch 'jc/conflict-marker-size'Junio C Hamano1-14/+46
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano1-42/+217
2010-01-17rerere: honor conflict-marker-size attributeJunio C Hamano1-2/+3
2010-01-17rerere: prepare for customizable conflict marker lengthJunio C Hamano1-10/+44
2010-01-16rerere: use ll_merge() instead of using xdl_merge()Junio C Hamano1-4/+1
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano1-2/+2
2010-01-10rerere forget path: forget recorded resolutionJunio C Hamano1-0/+133
2010-01-10rerere: refactor rerere logic to make it independent from I/OJunio C Hamano1-35/+76
2009-12-25rerere: remove silly 1024-byte line limitJunio C Hamano1-9/+10
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano1-3/+5
2009-09-13use write_str_in_full helper to avoid literal string lengthsJim Meyering1-1/+1
2009-04-29replace direct calls to unlink(2) with unlink_or_warnAlex Riesen1-1/+1
2009-02-14rerere: remove duplicated functionsSZEDER Gábor1-11/+11
2009-02-10Drop double-semicolon in CJunio C Hamano1-1/+1
2008-12-04Make some of fwrite/fclose/write/close failures visibleAlex Riesen1-11/+35
2008-10-30Merge branch 'ar/maint-mksnpath' into ar/mksnpathJunio C Hamano1-1/+1
2008-10-30Use git_pathdup instead of xstrdup(git_path(...))Alex Riesen1-1/+1
2008-10-21Merge branch 'jc/maint-co-track'Junio C Hamano1-1/+2
2008-10-19Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano1-1/+2
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey1-3/+1
2008-10-02fix openssl headers conflicting with custom SHA1 implementationsNicolas Pitre1-5/+5
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce1-10/+19
2008-09-09is_directory(): a generic helper functionJunio C Hamano1-2/+1
2008-08-30rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano1-2/+8
2008-08-30rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano1-10/+13
2008-07-21Rename path_list to string_listJohannes Schindelin1-20/+20
2008-07-16rerere.autoupdate: change the message when autoupdate is in effectJunio C Hamano1-2/+5
2008-07-14Merge branch 'js/merge-rr'Junio C Hamano1-1/+1
2008-07-10rerere: Separate libgit and builtin functionsStephan Beyer1-0/+360
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 08:38:09 +0000