Sign in
googlers
/
jrn
/
git
/
e2c2407683bf51c30004d2804623f2eb8e831b7a
/
unpack-trees.c
7d4e3a7
Merge branch 'jc/maint-1.6.0-read-tree-overlay'
by Junio C Hamano
· 16 years ago
aab3b9a
read-tree A B C: do not create a bogus index and do not segfault
by Junio C Hamano
· 16 years ago
c06ff49
Record ns-timestamps if possible, but do not use it without USE_NSEC
by Kjetil Barvik
· 16 years ago
1dcafcc
verify_uptodate(): add ce_uptodate(ce) test
by Kjetil Barvik
· 16 years ago
fba2f38
make USE_NSEC work as expected
by Kjetil Barvik
· 16 years ago
36419c8
check_updates(): effective removal of cache entries marked CE_REMOVE
by Kjetil Barvik
· 16 years ago
7847892
unlink_entry(): introduce schedule_dir_for_removal()
by Kjetil Barvik
· 16 years ago
5719989
lstat_cache(): swap func(length, string) into func(string, length)
by Kjetil Barvik
· 16 years ago
ddebfd1
Merge branch 'maint'
by Junio C Hamano
· 16 years ago
6ac9229
Merge branch 'maint-1.6.0' into maint
by Junio C Hamano
· 16 years ago
c7cddc1
merge: fix out-of-bounds memory access
by René Scharfe
· 16 years ago
0990e7a
Merge branch 'kb/lstat-cache'
by Junio C Hamano
· 16 years ago
692be9f
Merge branch 'cb/maint-unpack-trees-absense' into maint
by Junio C Hamano
· 16 years ago
09c9306
lstat_cache(): introduce has_symlink_or_noent_leading_path() function
by Kjetil Barvik
· 16 years ago
f39adc2
Merge branch 'cb/maint-unpack-trees-absense'
by Junio C Hamano
· 16 years ago
7b9e3ce
unpack-trees: remove redundant path search in verify_absent
by Clemens Buchacher
· 16 years ago
837e5fe
unpack-trees: fix path search bug in verify_absent
by Clemens Buchacher
· 16 years ago
6b9315d
unpack-trees: handle failure in verify_absent
by Clemens Buchacher
· 16 years ago
9db56f7
Fix non-literal format in printf-style calls
by Daniel Lowe
· 16 years ago
13494ed
correct cache_entry allocation
by Jeff King
· 16 years ago
5521883
checkout: do not lose staged removal
by Junio C Hamano
· 16 years ago
913e0e9
unpack_trees(): protect the handcrafted in-core index from read_cache()
by Junio C Hamano
· 17 years ago
2e2b887
unpack_trees(): allow callers to differentiate worktree errors from merge errors
by Junio C Hamano
· 17 years ago
8ccba00
unpack-trees: allow Porcelain to give different error messages
by Junio C Hamano
· 17 years ago
c40641b
Optimize symlink/directory detection
by Linus Torvalds
· 17 years ago
1fa6ead
Make unpack-tree update removed files before any updated files
by Linus Torvalds
· 17 years ago
32260ad
Make branch merging aware of underlying case-insensitive filsystems
by Linus Torvalds
· 17 years ago
cd2fef5
Make hash_name_lookup able to do case-independent lookups
by Linus Torvalds
· 17 years ago
df292c7
Make "index_name_exists()" return the cache_entry it found
by Linus Torvalds
· 17 years ago
c4758d3
Fix read-tree not to discard errors
by Junio C Hamano
· 17 years ago
7f8ab8d
Don't update unchanged merge entries
by Linus Torvalds
· 17 years ago
fac4b32
Fix recent 'unpack_trees()'-related changes breaking 'git stash'
by Linus Torvalds
· 17 years ago
ca885a4
read-tree() and unpack_trees(): use consistent limit
by Junio C Hamano
· 17 years ago
20a16eb
unpack_trees(): fix diff-index regression.
by Linus Torvalds
· 17 years ago
542c264
traverse_trees_recursive(): propagate merge errors up
by Junio C Hamano
· 17 years ago
1caeacc
unpack_trees(): minor memory leak fix in unused destination index
by Linus Torvalds
· 17 years ago
34110cd
Make 'unpack_trees()' have a separate source and destination index
by Linus Torvalds
· 17 years ago
bc052d7
Make 'unpack_trees()' take the index to work on as an argument
by Linus Torvalds
· 17 years ago
0190457
Move 'unpack_trees()' over to 'traverse_trees()' interface
by Linus Torvalds
· 17 years ago
5a4d707
Merge branch 'db/checkout'
by Junio C Hamano
· 17 years ago
e854864
Be more verbose when checkout takes a long time
by Linus Torvalds
· 17 years ago
eb7a2f1
Use helper function for copying index entry information
by Linus Torvalds
· 17 years ago
987e315
Merge branch 'jc/gitignore-ends-with-slash'
by Junio C Hamano
· 17 years ago
4e7c457
Add "skip_unmerged" option to unpack_trees.
by Daniel Barkalow
· 17 years ago
33ecf7e
Discard "deleted" cache entries after using them to update the working tree
by Daniel Barkalow
· 17 years ago
b05c6df
Send unpack-trees debugging output to stderr
by Daniel Barkalow
· 17 years ago
17e4642
Add flag to make unpack_trees() not print errors.
by Daniel Barkalow
· 17 years ago
203a2fe
Allow callers of unpack_trees() to handle failure
by Daniel Barkalow
· 17 years ago
6831a88
gitignore: lazily find dtype
by Junio C Hamano
· 17 years ago
d6b8fc3
gitignore(5): Allow "foo/" in ignore list to match directory "foo"
by Junio C Hamano
· 17 years ago
7a51ed6
Make on-disk index representation separate from in-core one
by Linus Torvalds
· 17 years ago
f2fdd10
unpack-trees: FLEX_ARRAY fix
by Linus Torvalds
· 17 years ago
63d285c
per-directory-exclude: lazily read .gitignore files
by Junio C Hamano
· 17 years ago
c78a249
Merge branch 'jc/maint-add-sync-stat'
by Junio C Hamano
· 17 years ago
4bd5b7d
ce_match_stat, run_diff_files: use symbolic constants for readability
by Junio C Hamano
· 17 years ago
4d4fcc5
relax usage of the progress API
by Nicolas Pitre
· 17 years ago
dc6a075
make struct progress an opaque type
by Nicolas Pitre
· 17 years ago
42e18fb
more compact progress display
by Nicolas Pitre
· 17 years ago
566b5c0
Optimize the three-way merge of git-read-tree
by Linus Torvalds
· 18 years ago
d699676
Optimize the two-way merge of git-read-tree too
by Linus Torvalds
· 18 years ago
288f072
Optimize the common cases of git-read-tree
by Linus Torvalds
· 18 years ago
b48d5a0
Move old index entry removal from "unpack_trees()" into the individual functions
by Linus Torvalds
· 18 years ago
933bf40
Start moving unpack-trees to "struct tree_desc"
by Linus Torvalds
· 18 years ago
936492d
unpack-trees.c: assume submodules are clean during check-out
by Junio C Hamano
· 18 years ago
1843d8d
cleanup unpack-trees.c: shrink struct tree_entry_list
by René Scharfe
· 18 years ago
0cf7375
unpack-trees.c: assume submodules are clean during check-out
by Sven Verdoolaege
· 18 years ago
ec0603e
Teach read-tree 2-way merge to ignore intermediate symlinks
by Junio C Hamano
· 18 years ago
7df6ddf
Merge branch 'maint-1.5.1' into maint
by Junio C Hamano
· 18 years ago
0a76f66
unpack-trees.c: verify_uptodate: remove dead code
by Sven Verdoolaege
· 18 years ago
16a4c61
read-tree -m -u: avoid getting confused by intermediate symlinks.
by Junio C Hamano
· 18 years ago
55a9137
delay progress display when checking out files
by Nicolas Pitre
· 18 years ago
13aaf14
make progress "title" part of the common progress interface
by Nicolas Pitre
· 18 years ago
96a02f8
common progress display support
by Nicolas Pitre
· 18 years ago
4c4caaf
Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
by Junio C Hamano
· 18 years ago
ea4b52a
t1000: fix case table.
by Junio C Hamano
· 18 years ago
c819353
Fix switching to a branch with D/F when current branch has file D.
by Junio C Hamano
· 18 years ago
b8ba153
Fix twoway_merge that passed d/f conflict marker to merged_entry().
by Junio C Hamano
· 18 years ago
9a4d8fd
unpack-trees: get rid of *indpos parameter.
by Junio C Hamano
· 18 years ago
7f7932a
unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
by Junio C Hamano
· 18 years ago
6fda5e5
Initialize tree descriptors with a helper function rather than by hand.
by Linus Torvalds
· 18 years ago
8502357
simplify inclusion of system header files.
by Junio C Hamano
· 18 years ago
f388cec
Merge branch 'jc/read-tree-ignore'
by Junio C Hamano
· 18 years ago
f8a9d42
read-tree: further loosen "working file will be lost" check.
by Junio C Hamano
· 18 years ago
0fb1eaa
unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
by Junio C Hamano
· 18 years ago
ed93b44
merge: loosen overcautious "working file will be lost" check.
by Junio C Hamano
· 18 years ago
e702496
Convert memcpy(a,b,20) to hashcpy(a,b).
by Shawn Pearce
· 19 years ago
a89fccd
Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
by David Rientjes
· 19 years ago
96f1e58
remove unnecessary initializations
by David Rientjes
· 19 years ago
6f002f9
use appropriate typedefs
by David Rientjes
· 19 years ago
076b0ad
read-tree: move merge functions to the library
by Johannes Schindelin
· 19 years ago
16da134
read-trees: refactor the unpack_trees() part
by Johannes Schindelin
· 19 years ago