64 Commits (7a4ee28f41270bf032d0dd0bfb17f601b9b3971a)

Author SHA1 Message Date
Alexandre Julliard db137fe91e read-tree: Fix regression with creation of a new index file. 16 years ago
Stephen Boyd 5a56da5806 read-tree: migrate to parse-options 16 years ago
Stephen Boyd a429d2dd76 read-tree: convert unhelpful usage()'s to helpful die()'s 16 years ago
Junio C Hamano 456156dc06 read-tree -m A B: prime cache-tree from the switched-to tree 16 years ago
Junio C Hamano b9d37a5420 Move prime_cache_tree() to cache-tree.c 16 years ago
Junio C Hamano 8cc21ce78c read-tree A B: do not corrupt cache-tree 16 years ago
Johannes Schindelin 7c4c97c0ac Turn the flags in struct dir_struct into a single variable 16 years ago
Junio C Hamano fa7b3c2f75 checkout: Fix "initial checkout" detection 16 years ago
Heikki Orsila f18d244a63 Start conforming code to "git subcmd" style part 3 17 years ago
Junio C Hamano 5521883490 checkout: do not lose staged removal 17 years ago
Nguyễn Thái Ngọc Duy b6469a81d2 read-tree: setup worktree if merge is required 17 years ago
Miklos Vajna e46bbcf6e8 Move read_cache_unmerged() to read-cache.c 17 years ago
Johannes Schindelin ef90d6d420 Provide git_config with a callback-data parameter 17 years ago
Linus Torvalds 96872bc200 Move name hashing functions into a file of its own 17 years ago
Junio C Hamano ca885a4fe6 read-tree() and unpack_trees(): use consistent limit 17 years ago
Linus Torvalds 34110cd4e3 Make 'unpack_trees()' have a separate source and destination index 17 years ago
Linus Torvalds bc052d7f43 Make 'unpack_trees()' take the index to work on as an argument 17 years ago
Linus Torvalds d070e3a31b Name hash fixups: export (and rename) remove_hash_entry 17 years ago
Junio C Hamano f5ed3b30e0 git-reset --hard and git-read-tree --reset: fix read_cache_unmerged() 17 years ago
Daniel Barkalow 203a2fe117 Allow callers of unpack_trees() to handle failure 17 years ago
Linus Torvalds 7a51ed66f6 Make on-disk index representation separate from in-core one 17 years ago
Brandon Casey 4ed7cd3ab0 Improve use of lockfile API 17 years ago
Junio C Hamano a9ab2009db Clean-up read-tree error condition. 18 years ago
Junio C Hamano f34f2b0b38 Fix read-tree merging more than 3 trees using 3-way merge 18 years ago
Linus Torvalds 933bf40a5c Start moving unpack-trees to "struct tree_desc" 18 years ago
Johannes Schindelin d825a97495 read-tree: remove unnecessary call to setup_git_directory() 18 years ago
Jakub Narebski 6da0878302 Document git read-tree --trivial 18 years ago
Junio C Hamano 2960a1d9ee Fix read-tree --prefix=dir/. 18 years ago
Junio C Hamano 5e7f56ac33 git-read-tree --index-output=<file> 18 years ago
Junio C Hamano 30ca07a249 _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file. 18 years ago
James Bowes aa4cfa8516 read-tree: use xcalloc 18 years ago
Linus Torvalds 6fda5e5180 Initialize tree descriptors with a helper function rather than by hand. 18 years ago
Junio C Hamano cc44c7655f Mechanical conversion to use prefixcmp() 18 years ago
Junio C Hamano 22f741dab7 read-tree: document --exclude-per-directory 18 years ago
Junio C Hamano f8a9d42872 read-tree: further loosen "working file will be lost" check. 18 years ago
Shawn Pearce e702496e43 Convert memcpy(a,b,20) to hashcpy(a,b). 19 years ago
David Rientjes 96f1e58f52 remove unnecessary initializations 19 years ago
Junio C Hamano 40aaae88ad Better error message when we are unable to lock the index file 19 years ago
Junio C Hamano a91af794bb read-tree: shadowed variable fix. 19 years ago
Johannes Schindelin 076b0adcf9 read-tree: move merge functions to the library 19 years ago
Johannes Schindelin 16da134b1f read-trees: refactor the unpack_trees() part 19 years ago
Linus Torvalds a633fca0c0 Call setup_git_directory() much earlier 19 years ago
Junio C Hamano f8f0b1f0e7 checkout -f failed to check out a file if an existing directory interfered. 19 years ago
Shawn Pearce 344c52aee5 Avoid C99 initializers 19 years ago
Johannes Schindelin 6244b24906 Close the index file between writing and committing 19 years ago
Florian Forster 571ea603a6 Don't use empty structure initializers. 19 years ago
Junio C Hamano 021b6e4549 Make index file locking code reusable to others. 19 years ago
Linus Torvalds eff97e3fae read-tree: fix eye-candy. 19 years ago
Junio C Hamano b266b123cd Fix earlier mismerges. 19 years ago
Junio C Hamano b0d6e64629 read-tree --reset: update working tree file for conflicted paths. 19 years ago