Google Git
Sign in
googlers / jrn / git / e4193dcf127ec46704dcc637af083b01302383b0 / rerere.c
  1. c59ba68 Merge branch 'js/check-null-from-read-object-file' by Junio C Hamano · 1 year, 1 month ago
  2. 568459b Always check the return value of `repo_read_object_file()` by Johannes Schindelin · 1 year, 1 month ago
  3. eea0e59 treewide: remove unnecessary includes in source files by Elijah Newren · 1 year, 3 months ago
  4. 5bb67fb Merge branch 'jc/unresolve-removal' by Junio C Hamano · 1 year, 5 months ago
  5. 3365e26 Merge branch 'jc/retire-get-sha1-hex' by Junio C Hamano · 1 year, 7 months ago
  6. 5bdedac checkout: allow "checkout -m path" to unmerge removed paths by Junio C Hamano · 1 year, 7 months ago
  7. 08e5fb1 hex: retire get_sha1_hex() by Junio C Hamano · 1 year, 8 months ago
  8. 91c080d git-compat-util: move alloc macros to git-compat-util.h by Calvin Wan · 1 year, 8 months ago
  9. da9502f treewide: remove unnecessary includes for wrapper.h by Calvin Wan · 1 year, 8 months ago
  10. a034e91 object-store-ll.h: split this header out of object-store.h by Elijah Newren · 1 year, 10 months ago
  11. 6723899 merge-ll: rename from ll-merge by Elijah Newren · 1 year, 10 months ago
  12. c339932 repository: remove unnecessary include of path.h by Elijah Newren · 1 year, 10 months ago
  13. bc5c5ec cache.h: remove this no-longer-used header by Elijah Newren · 1 year, 10 months ago
  14. 08c46a4 read-cache*.h: move declarations for read-cache.c functions from cache.h by Elijah Newren · 1 year, 10 months ago
  15. d5fff46 copy.h: move declarations for copy.c functions from cache.h by Elijah Newren · 1 year, 11 months ago
  16. b7b189c treewide: reduce includes of cache.h in other headers by Elijah Newren · 1 year, 11 months ago
  17. 87bed17 object-file.h: move declarations for object-file.c functions from cache.h by Elijah Newren · 1 year, 11 months ago
  18. e7dca80 Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h by Junio C Hamano · 2 years ago
  19. bc726bd cocci: apply the "object-store.h" part of "the_repository.pending" by Ævar Arnfjörð Bjarmason · 2 years ago
  20. d5ebb50 wrapper.h: move declarations for wrapper.c functions from cache.h by Elijah Newren · 2 years ago
  21. 0b027f6 abspath.h: move absolute path functions from cache.h by Elijah Newren · 2 years ago
  22. f394e09 treewide: be explicit about dependence on gettext.h by Elijah Newren · 2 years ago
  23. 41771fa cache.h: remove dependence on hex.h; make other files include it explicitly by Elijah Newren · 2 years ago
  24. 36bf195 alloc.h: move ALLOC_GROW() functions from cache.h by Elijah Newren · 2 years ago
  25. 538dc45 Merge branch 'ep/maint-equals-null-cocci' by Junio C Hamano · 2 years, 10 months ago
  26. afe8a90 tree-wide: apply equals-null.cocci by Junio C Hamano · 2 years, 10 months ago
  27. 35f6967 ll-merge: make callers responsible for showing warnings by Elijah Newren · 3 years, 1 month ago
  28. b548f0f dir: introduce readdir_skip_dot_and_dotdot() helper by Elijah Newren · 3 years, 10 months ago
  29. 680ff91 rerere: use strmap to store rerere directories by Jeff King · 4 years, 1 month ago
  30. 098c173 rerere: tighten rr-cache dirname check by Jeff King · 4 years, 1 month ago
  31. 2bc1a87 rerere: check dirname format while iterating rr_cache directory by Jeff King · 4 years, 1 month ago
  32. bc62692 hash-lookup: rename from sha1-lookup by Martin Ågren · 4 years, 2 months ago
  33. 7a7d992 sha1-lookup: rename `sha1_pos()` as `hash_pos()` by Martin Ågren · 4 years, 2 months ago
  34. 15beaaa Fix spelling errors in code comments by Elijah Newren · 5 years ago
  35. 3f34d70 rerere: replace sha1_to_hex by brian m. carlson · 6 years ago
  36. e1ff0a3 read-cache.c: kill read_index() by Nguyễn Thái Ngọc Duy · 6 years ago
  37. 3a95f31 repository.c: replace hold_locked_index() with repo_hold_locked_index() by Nguyễn Thái Ngọc Duy · 6 years ago
  38. 55e6b35 rerere.c: remove the_repository references by Nguyễn Thái Ngọc Duy · 6 years ago
  39. d829d49 Merge branch 'bc/hash-transition-part-15' by Junio C Hamano · 6 years ago
  40. 11877b9 Merge branch 'nd/the-index' by Junio C Hamano · 6 years ago
  41. 0d7c419 rerere: convert to use the_hash_algo by brian m. carlson · 6 years ago
  42. bd3941a Merge branch 'en/rerere-multi-stage-1-fix' by Junio C Hamano · 6 years ago
  43. 35843b1 rerere.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
  44. 32eaa46 ll-merge.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
  45. 3900689 Merge branch 'tg/rerere' by Junio C Hamano · 6 years ago
  46. ad2bf0d rerere: avoid buffer overrun by Elijah Newren · 6 years ago
  47. 6d2df28 dir.c: remove an implicit dependency on the_index in pathspec code by Nguyễn Thái Ngọc Duy · 7 years ago
  48. bd7dfa5 rerere: recalculate conflict ID when unresolved conflict is committed by Thomas Gummerer · 7 years ago
  49. 4af3220 rerere: teach rerere to handle nested conflicts by Thomas Gummerer · 7 years ago
  50. 5ebbdad rerere: return strbuf from handle path by Thomas Gummerer · 7 years ago
  51. c0f16f8 rerere: factor out handle_conflict function by Thomas Gummerer · 7 years ago
  52. 221444f rerere: only return whether a path has conflicts or not by Thomas Gummerer · 7 years ago
  53. 93406a2 rerere: fix crash with files rerere can't handle by Thomas Gummerer · 7 years ago
  54. fb90dca rerere: add documentation for conflict normalization by Thomas Gummerer · 7 years ago
  55. 2373b65 rerere: mark strings for translation by Thomas Gummerer · 7 years ago
  56. 00624d6 Merge branch 'sb/object-store-grafts' by Junio C Hamano · 7 years ago
  57. 28fc9ab rerere: wrap paths in output in sq by Thomas Gummerer · 7 years ago
  58. c5d1d13 rerere: lowercase error messages by Thomas Gummerer · 7 years ago
  59. e69db0b rerere: unify error messages when read_cache fails by Thomas Gummerer · 7 years ago
  60. 2f76ebc Merge branch 'ma/lockfile-cleanup' by Junio C Hamano · 7 years ago
  61. 102de88 path.c: migrate global git_path_* to take a repository argument by Stefan Beller · 7 years ago
  62. cbd53a2 object-store: move object access functions to object-store.h by Stefan Beller · 7 years ago
  63. 0fa5a2e lock_file: move static locks into functions by Martin Ågren · 7 years ago
  64. a5bbc29 Merge branch 'bc/object-id' by Junio C Hamano · 7 years ago
  65. b4f5aca sha1_file: convert read_sha1_file to struct object_id by brian m. carlson · 7 years ago
  66. 6100081 write_locked_index(): add flag to avoid writing unchanged index by Martin Ågren · 7 years ago
  67. f919ffe Use MOVE_ARRAY by SZEDER Gábor · 7 years ago
  68. c50424a Merge branch 'jk/write-in-full-fix' by Junio C Hamano · 7 years ago
  69. 06f46f2 avoid "write_in_full(fd, buf, len) != len" pattern by Jeff King · 7 years ago
  70. 6e96cb5 rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved by Junio C Hamano · 8 years ago
  71. 5ea8227 rerere: represent time duration in timestamp_t internally by Junio C Hamano · 8 years ago
  72. 50f03c6 Merge branch 'ab/free-and-null' by Junio C Hamano · 8 years ago
  73. f31d23a Merge branch 'bw/config-h' by Junio C Hamano · 8 years ago
  74. 88ce3ef *.[ch] refactoring: make use of the FREE_AND_NULL() macro by Ævar Arnfjörð Bjarmason · 8 years ago
  75. b2141fc config: don't include config.h by default by Brandon Williams · 8 years ago
  76. f7566f0 rerere.c: move error_errno() closer to the source system call by Nguyễn Thái Ngọc Duy · 8 years ago
  77. 5118d7f print errno when reporting a system call error by Nguyễn Thái Ngọc Duy · 8 years ago
  78. e9d983f wrapper.c: add and use fopen_or_warn() by Nguyễn Thái Ngọc Duy · 8 years ago
  79. b3e83cc hold_locked_index(): align error handling with hold_lockfile_for_update() by Junio C Hamano · 8 years ago
  80. 99d1a98 cache: convert struct cache_entry to use struct object_id by brian m. carlson · 9 years ago
  81. ec34a8b Merge branch 'jc/rerere-multi' by Junio C Hamano · 9 years ago
  82. d9d501b rerere: remove an null statement by Junio C Hamano · 9 years ago
  83. 40cfc95 Merge branch 'nd/error-errno' by Junio C Hamano · 9 years ago
  84. 8f44961 rerere: plug memory leaks upon "rerere forget" failure by Junio C Hamano · 9 years ago
  85. 033e011 rerere.c: use error_errno() and warning_errno() by Nguyễn Thái Ngọc Duy · 9 years ago
  86. 5b715ec Merge branch 'jc/rerere-multi' by Junio C Hamano · 9 years ago
  87. 890fca8 rerere: adjust 'forget' to multi-variant world order by Junio C Hamano · 9 years ago
  88. 0ce02b3 rerere: split code to call ll_merge() further by Junio C Hamano · 9 years ago
  89. 3d730ed rerere: move code related to "forget" together by Junio C Hamano · 9 years ago
  90. 1be1e85 rerere: gc and clear by Junio C Hamano · 9 years ago
  91. 629716d rerere: do use multiple variants by Junio C Hamano · 10 years ago
  92. a13d137 rerere: allow multiple variants to exist by Junio C Hamano · 10 years ago
  93. c0a5423 rerere: delay the recording of preimage by Junio C Hamano · 10 years ago
  94. 05dd9f1 rerere: handle leftover rr-cache/$ID directory and postimage files by Junio C Hamano · 10 years ago
  95. b1a90b6 Merge branch 'jk/rerere-xsnprintf' by Junio C Hamano · 9 years ago
  96. 2c7929b rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id by Junio C Hamano · 10 years ago
  97. 1869bbe rerere: split conflict ID further by Junio C Hamano · 10 years ago
  98. f58316d rerere: replace strcpy with xsnprintf by Jeff King · 9 years ago
  99. dc5400e Merge branch 'jc/rerere' by Junio C Hamano · 9 years ago
  100. 9dd330e rerere: release lockfile in non-writing functions by Jeff King · 10 years ago