๐ AIๆ็ดข & ไปฃ็
๐
ไธป้กต
Sign in
chromium
/
external
/
github.com
/
git
/
git
/
refs/tags/v2.43.1
/
rerere.c
tag
9c98e72e0329036735d6b873b88d0d840f5d8214
tagger
Junio C Hamano <gitster@pobox.com>
Fri Feb 09 00:22:52 2024
object
3526e67d917bcd03f317a058208fa02737654637
Git 2.43.1
eea0e59
treewide: remove unnecessary includes in source files
by Elijah Newren
ยท 2 years ago
5bb67fb
Merge branch 'jc/unresolve-removal'
by Junio C Hamano
ยท 2 years, 2 months ago
3365e26
Merge branch 'jc/retire-get-sha1-hex'
by Junio C Hamano
ยท 2 years, 4 months ago
5bdedac
checkout: allow "checkout -m path" to unmerge removed paths
by Junio C Hamano
ยท 2 years, 4 months ago
08e5fb1
hex: retire get_sha1_hex()
by Junio C Hamano
ยท 2 years, 5 months ago
91c080d
git-compat-util: move alloc macros to git-compat-util.h
by Calvin Wan
ยท 2 years, 5 months ago
da9502f
treewide: remove unnecessary includes for wrapper.h
by Calvin Wan
ยท 2 years, 5 months ago
a034e91
object-store-ll.h: split this header out of object-store.h
by Elijah Newren
ยท 2 years, 6 months ago
6723899
merge-ll: rename from ll-merge
by Elijah Newren
ยท 2 years, 6 months ago
c339932
repository: remove unnecessary include of path.h
by Elijah Newren
ยท 2 years, 6 months ago
bc5c5ec
cache.h: remove this no-longer-used header
by Elijah Newren
ยท 2 years, 6 months ago
08c46a4
read-cache*.h: move declarations for read-cache.c functions from cache.h
by Elijah Newren
ยท 2 years, 6 months ago
d5fff46
copy.h: move declarations for copy.c functions from cache.h
by Elijah Newren
ยท 2 years, 8 months ago
b7b189c
treewide: reduce includes of cache.h in other headers
by Elijah Newren
ยท 2 years, 8 months ago
87bed17
object-file.h: move declarations for object-file.c functions from cache.h
by Elijah Newren
ยท 2 years, 8 months ago
e7dca80
Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
by Junio C Hamano
ยท 2 years, 8 months ago
bc726bd
cocci: apply the "object-store.h" part of "the_repository.pending"
by รvar Arnfjรถrรฐ Bjarmason
ยท 2 years, 9 months ago
d5ebb50
wrapper.h: move declarations for wrapper.c functions from cache.h
by Elijah Newren
ยท 2 years, 9 months ago
0b027f6
abspath.h: move absolute path functions from cache.h
by Elijah Newren
ยท 2 years, 9 months ago
f394e09
treewide: be explicit about dependence on gettext.h
by Elijah Newren
ยท 2 years, 9 months ago
41771fa
cache.h: remove dependence on hex.h; make other files include it explicitly
by Elijah Newren
ยท 2 years, 10 months ago
36bf195
alloc.h: move ALLOC_GROW() functions from cache.h
by Elijah Newren
ยท 2 years, 10 months ago
538dc45
Merge branch 'ep/maint-equals-null-cocci'
by Junio C Hamano
ยท 3 years, 7 months ago
afe8a90
tree-wide: apply equals-null.cocci
by Junio C Hamano
ยท 3 years, 8 months ago
35f6967
ll-merge: make callers responsible for showing warnings
by Elijah Newren
ยท 3 years, 10 months ago
b548f0f
dir: introduce readdir_skip_dot_and_dotdot() helper
by Elijah Newren
ยท 4 years, 7 months ago
680ff91
rerere: use strmap to store rerere directories
by Jeff King
ยท 4 years, 11 months ago
098c173
rerere: tighten rr-cache dirname check
by Jeff King
ยท 4 years, 11 months ago
2bc1a87
rerere: check dirname format while iterating rr_cache directory
by Jeff King
ยท 4 years, 11 months ago
bc62692
hash-lookup: rename from sha1-lookup
by Martin ร gren
ยท 5 years ago
7a7d992
sha1-lookup: rename `sha1_pos()` as `hash_pos()`
by Martin ร gren
ยท 5 years ago
15beaaa
Fix spelling errors in code comments
by Elijah Newren
ยท 6 years ago
3f34d70
rerere: replace sha1_to_hex
by brian m. carlson
ยท 6 years ago
e1ff0a3
read-cache.c: kill read_index()
by Nguyแป n Thรกi Ngแปc Duy
ยท 7 years ago
3a95f31
repository.c: replace hold_locked_index() with repo_hold_locked_index()
by Nguyแป n Thรกi Ngแปc Duy
ยท 7 years ago
55e6b35
rerere.c: remove the_repository references
by Nguyแป n Thรกi Ngแปc Duy
ยท 7 years ago
d829d49
Merge branch 'bc/hash-transition-part-15'
by Junio C Hamano
ยท 7 years ago
11877b9
Merge branch 'nd/the-index'
by Junio C Hamano
ยท 7 years ago
0d7c419
rerere: convert to use the_hash_algo
by brian m. carlson
ยท 7 years ago
bd3941a
Merge branch 'en/rerere-multi-stage-1-fix'
by Junio C Hamano
ยท 7 years ago
35843b1
rerere.c: remove implicit dependency on the_index
by Nguyแป n Thรกi Ngแปc Duy
ยท 7 years ago
32eaa46
ll-merge.c: remove implicit dependency on the_index
by Nguyแป n Thรกi Ngแปc Duy
ยท 7 years ago
3900689
Merge branch 'tg/rerere'
by Junio C Hamano
ยท 7 years ago
ad2bf0d
rerere: avoid buffer overrun
by Elijah Newren
ยท 7 years ago
6d2df28
dir.c: remove an implicit dependency on the_index in pathspec code
by Nguyแป n Thรกi Ngแปc Duy
ยท 7 years ago
bd7dfa5
rerere: recalculate conflict ID when unresolved conflict is committed
by Thomas Gummerer
ยท 7 years ago
4af3220
rerere: teach rerere to handle nested conflicts
by Thomas Gummerer
ยท 7 years ago
5ebbdad
rerere: return strbuf from handle path
by Thomas Gummerer
ยท 7 years ago
c0f16f8
rerere: factor out handle_conflict function
by Thomas Gummerer
ยท 7 years ago
221444f
rerere: only return whether a path has conflicts or not
by Thomas Gummerer
ยท 7 years ago
93406a2
rerere: fix crash with files rerere can't handle
by Thomas Gummerer
ยท 7 years ago
fb90dca
rerere: add documentation for conflict normalization
by Thomas Gummerer
ยท 7 years ago
2373b65
rerere: mark strings for translation
by Thomas Gummerer
ยท 7 years ago
00624d6
Merge branch 'sb/object-store-grafts'
by Junio C Hamano
ยท 7 years ago
28fc9ab
rerere: wrap paths in output in sq
by Thomas Gummerer
ยท 7 years ago
c5d1d13
rerere: lowercase error messages
by Thomas Gummerer
ยท 7 years ago
e69db0b
rerere: unify error messages when read_cache fails
by Thomas Gummerer
ยท 7 years ago
2f76ebc
Merge branch 'ma/lockfile-cleanup'
by Junio C Hamano
ยท 8 years ago
102de88
path.c: migrate global git_path_* to take a repository argument
by Stefan Beller
ยท 8 years ago
cbd53a2
object-store: move object access functions to object-store.h
by Stefan Beller
ยท 8 years ago
0fa5a2e
lock_file: move static locks into functions
by Martin ร gren
ยท 8 years ago
a5bbc29
Merge branch 'bc/object-id'
by Junio C Hamano
ยท 8 years ago
b4f5aca
sha1_file: convert read_sha1_file to struct object_id
by brian m. carlson
ยท 8 years ago
6100081
write_locked_index(): add flag to avoid writing unchanged index
by Martin ร gren
ยท 8 years ago
f919ffe
Use MOVE_ARRAY
by SZEDER Gรกbor
ยท 8 years ago
c50424a
Merge branch 'jk/write-in-full-fix'
by Junio C Hamano
ยท 8 years ago
06f46f2
avoid "write_in_full(fd, buf, len) != len" pattern
by Jeff King
ยท 8 years ago
6e96cb5
rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved
by Junio C Hamano
ยท 8 years ago
5ea8227
rerere: represent time duration in timestamp_t internally
by Junio C Hamano
ยท 8 years ago
50f03c6
Merge branch 'ab/free-and-null'
by Junio C Hamano
ยท 8 years ago
f31d23a
Merge branch 'bw/config-h'
by Junio C Hamano
ยท 8 years ago
88ce3ef
*.[ch] refactoring: make use of the FREE_AND_NULL() macro
by รvar Arnfjรถrรฐ Bjarmason
ยท 8 years ago
b2141fc
config: don't include config.h by default
by Brandon Williams
ยท 8 years ago
f7566f0
rerere.c: move error_errno() closer to the source system call
by Nguyแป n Thรกi Ngแปc Duy
ยท 9 years ago
5118d7f
print errno when reporting a system call error
by Nguyแป n Thรกi Ngแปc Duy
ยท 9 years ago
e9d983f
wrapper.c: add and use fopen_or_warn()
by Nguyแป n Thรกi Ngแปc Duy
ยท 9 years ago
b3e83cc
hold_locked_index(): align error handling with hold_lockfile_for_update()
by Junio C Hamano
ยท 9 years ago
99d1a98
cache: convert struct cache_entry to use struct object_id
by brian m. carlson
ยท 9 years ago
ec34a8b
Merge branch 'jc/rerere-multi'
by Junio C Hamano
ยท 10 years ago
d9d501b
rerere: remove an null statement
by Junio C Hamano
ยท 10 years ago
40cfc95
Merge branch 'nd/error-errno'
by Junio C Hamano
ยท 10 years ago
8f44961
rerere: plug memory leaks upon "rerere forget" failure
by Junio C Hamano
ยท 10 years ago
033e011
rerere.c: use error_errno() and warning_errno()
by Nguyแป n Thรกi Ngแปc Duy
ยท 10 years ago
5b715ec
Merge branch 'jc/rerere-multi'
by Junio C Hamano
ยท 10 years ago
890fca8
rerere: adjust 'forget' to multi-variant world order
by Junio C Hamano
ยท 10 years ago
0ce02b3
rerere: split code to call ll_merge() further
by Junio C Hamano
ยท 10 years ago
3d730ed
rerere: move code related to "forget" together
by Junio C Hamano
ยท 10 years ago
1be1e85
rerere: gc and clear
by Junio C Hamano
ยท 10 years ago
629716d
rerere: do use multiple variants
by Junio C Hamano
ยท 10 years ago
a13d137
rerere: allow multiple variants to exist
by Junio C Hamano
ยท 10 years ago
c0a5423
rerere: delay the recording of preimage
by Junio C Hamano
ยท 10 years ago
05dd9f1
rerere: handle leftover rr-cache/$ID directory and postimage files
by Junio C Hamano
ยท 10 years ago
b1a90b6
Merge branch 'jk/rerere-xsnprintf'
by Junio C Hamano
ยท 10 years ago
2c7929b
rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
by Junio C Hamano
ยท 10 years ago
1869bbe
rerere: split conflict ID further
by Junio C Hamano
ยท 10 years ago
f58316d
rerere: replace strcpy with xsnprintf
by Jeff King
ยท 10 years ago
dc5400e
Merge branch 'jc/rerere'
by Junio C Hamano
ยท 10 years ago
9dd330e
rerere: release lockfile in non-writing functions
by Jeff King
ยท 10 years ago
f932729
memoize common git-path "constant" files
by Jeff King
ยท 10 years ago
15ed07d
rerere: un-nest merge() further
by Junio C Hamano
ยท 10 years ago
Next »