163 Commits (b778c1eef50e001807aa723bdc9cb2685a59db0f)

Author SHA1 Message Date
Elijah Newren 15beaaa3d1 Fix spelling errors in code comments 5 years ago
brian m. carlson 3f34d70d40 rerere: replace sha1_to_hex 6 years ago
Nguyễn Thái Ngọc Duy e1ff0a32e4 read-cache.c: kill read_index() 6 years ago
Nguyễn Thái Ngọc Duy 3a95f31d1c repository.c: replace hold_locked_index() with repo_hold_locked_index() 6 years ago
Nguyễn Thái Ngọc Duy 55e6b3547d rerere.c: remove the_repository references 6 years ago
brian m. carlson 0d7c419a94 rerere: convert to use the_hash_algo 6 years ago
Nguyễn Thái Ngọc Duy 35843b1123 rerere.c: remove implicit dependency on the_index 6 years ago
Nguyễn Thái Ngọc Duy 32eaa46883 ll-merge.c: remove implicit dependency on the_index 6 years ago
Elijah Newren ad2bf0d9b4 rerere: avoid buffer overrun 6 years ago
Nguyễn Thái Ngọc Duy 6d2df284e7 dir.c: remove an implicit dependency on the_index in pathspec code 7 years ago
Thomas Gummerer bd7dfa543e rerere: recalculate conflict ID when unresolved conflict is committed 7 years ago
Thomas Gummerer 4af32207bc rerere: teach rerere to handle nested conflicts 7 years ago
Thomas Gummerer 5ebbdad344 rerere: return strbuf from handle path 7 years ago
Thomas Gummerer c0f16f8e14 rerere: factor out handle_conflict function 7 years ago
Thomas Gummerer 221444f5d1 rerere: only return whether a path has conflicts or not 7 years ago
Thomas Gummerer 93406a282f rerere: fix crash with files rerere can't handle 7 years ago
Thomas Gummerer fb90dca34c rerere: add documentation for conflict normalization 7 years ago
Thomas Gummerer 2373b65059 rerere: mark strings for translation 7 years ago
Thomas Gummerer 28fc9abd3f rerere: wrap paths in output in sq 7 years ago
Thomas Gummerer c5d1d13239 rerere: lowercase error messages 7 years ago
Thomas Gummerer e69db0b323 rerere: unify error messages when read_cache fails 7 years ago
Stefan Beller 102de880d2 path.c: migrate global git_path_* to take a repository argument 7 years ago
Stefan Beller cbd53a2193 object-store: move object access functions to object-store.h 7 years ago
Martin Ågren 0fa5a2ed8d lock_file: move static locks into functions 7 years ago
brian m. carlson b4f5aca40e sha1_file: convert read_sha1_file to struct object_id 7 years ago
Martin Ågren 610008146e write_locked_index(): add flag to avoid writing unchanged index 7 years ago
SZEDER Gábor f919ffebed Use MOVE_ARRAY 7 years ago
Jeff King 06f46f237a avoid "write_in_full(fd, buf, len) != len" pattern 7 years ago
Junio C Hamano 6e96cb5286 rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved 8 years ago
Junio C Hamano 5ea82279c0 rerere: represent time duration in timestamp_t internally 8 years ago
Ævar Arnfjörð Bjarmason 88ce3ef636 *.[ch] refactoring: make use of the FREE_AND_NULL() macro 8 years ago
Brandon Williams b2141fc1d2 config: don't include config.h by default 8 years ago
Nguyễn Thái Ngọc Duy f7566f073f rerere.c: move error_errno() closer to the source system call 8 years ago
Nguyễn Thái Ngọc Duy 5118d7f4e6 print errno when reporting a system call error 8 years ago
Nguyễn Thái Ngọc Duy e9d983f116 wrapper.c: add and use fopen_or_warn() 8 years ago
Junio C Hamano b3e83cc752 hold_locked_index(): align error handling with hold_lockfile_for_update() 8 years ago
brian m. carlson 99d1a9861a cache: convert struct cache_entry to use struct object_id 9 years ago
Junio C Hamano d9d501b068 rerere: remove an null statement 9 years ago
Junio C Hamano 8f4496148b rerere: plug memory leaks upon "rerere forget" failure 9 years ago
Nguyễn Thái Ngọc Duy 033e011e64 rerere.c: use error_errno() and warning_errno() 9 years ago
Junio C Hamano 890fca84be rerere: adjust 'forget' to multi-variant world order 9 years ago
Junio C Hamano 0ce02b3620 rerere: split code to call ll_merge() further 9 years ago
Junio C Hamano 3d730ed9b2 rerere: move code related to "forget" together 9 years ago
Junio C Hamano 1be1e85115 rerere: gc and clear 9 years ago
Junio C Hamano 629716d256 rerere: do use multiple variants 9 years ago
Junio C Hamano a13d13700b rerere: allow multiple variants to exist 9 years ago
Junio C Hamano c0a5423b6f rerere: delay the recording of preimage 9 years ago
Junio C Hamano 05dd9f139d rerere: handle leftover rr-cache/$ID directory and postimage files 9 years ago
Junio C Hamano 2c7929b133 rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id 9 years ago
Junio C Hamano 1869bbe1ce rerere: split conflict ID further 9 years ago