45 Commits (ccbb3d17ace70be9d986368d3df795f5961e9683)

Author SHA1 Message Date
Linus Torvalds b507b465f7 git-apply: prepare for upcoming GNU diff -u format change. 18 years ago
Rene Scharfe abdc3fc842 Add hash_sha1_file() 18 years ago
Junio C Hamano 854de5a534 apply --numstat -z: line termination fix. 18 years ago
Junio C Hamano ce74618d95 git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1) 18 years ago
Junio C Hamano d0c25035df git-apply: second war on whitespace. 18 years ago
Junio C Hamano 4be609625e apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches 18 years ago
Junio C Hamano 2b6eef943f Make apply --binary a no-op. 18 years ago
Shawn Pearce 9befac470b Replace uses of strdup with xstrdup. 18 years ago
Junio C Hamano 4cac42b132 free(NULL) is perfectly valid. 18 years ago
Junio C Hamano 8938045a4e git-apply --reject: finishing touches. 18 years ago
Pierre Habouzit dd305c8462 use name[len] in switch directly, instead of creating a shadowed variable. 18 years ago
Pierre Habouzit 60b7f38e0e avoid to use error that shadows the function name, use err instead. 18 years ago
Junio C Hamano 0e9ee32358 apply --reject: count hunks starting from 1, not 0 18 years ago
Junio C Hamano a2bf404e28 git-apply --verbose 18 years ago
Junio C Hamano 82e2765f59 git-apply --reject: send rejects to .rej files. 18 years ago
Junio C Hamano 57dc397cff git-apply --reject 18 years ago
Junio C Hamano 2cda1a214e apply --reverse: tie it all together. 18 years ago
Junio C Hamano 03eb8f8aeb builtin-apply --reverse: two bugfixes. 18 years ago
David Rientjes 96f1e58f52 remove unnecessary initializations 18 years ago
David Rientjes 0bef57ee44 make inline is_null_sha1 global 18 years ago
Junio C Hamano 3cd4f5e8eb git-apply --binary: clean up and prepare for --reverse 19 years ago
Junio C Hamano f686d03034 git-apply --reverse: simplify reverse option. 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 242abf106c builtin-apply: remove unused increment 19 years ago
Junio C Hamano 2c71810b90 git-apply: applying a patch to make a symlink shorter. 19 years ago
Linus Torvalds a633fca0c0 Call setup_git_directory() much earlier 19 years ago
Junio C Hamano ab9f30fd75 git-apply -R: binary patches are irreversible for now. 19 years ago
Johannes Schindelin e5a94313c0 Teach git-apply about '-R' 19 years ago
Johannes Schindelin 56ac168f6f Fix t4114 on cygwin 19 years ago
Junio C Hamano 7f95aef28f apply: handle type-changing patch correctly. 19 years ago
Junio C Hamano eed46644ca apply: split out removal and creation into different phases. 19 years ago
Junio C Hamano c28c571c14 apply: check D/F conflicts more carefully. 19 years ago
Pavel Roskin a9486b02ec Avoid C99 comments, use old-style C comments instead. 19 years ago
Pavel Roskin 82e5a82fd7 Fix more typos, primarily in the code 19 years ago
Johannes Schindelin 6244b24906 Close the index file between writing and committing 19 years ago
Johannes Schindelin 3eaa38da94 apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag. 19 years ago
Florian Forster 1d7f171c3a Remove all void-pointer arithmetic. 19 years ago
Junio C Hamano 021b6e4549 Make index file locking code reusable to others. 19 years ago
Peter Eriksen ac6245e31a Builtin git-apply. 19 years ago
Junio C Hamano d91d4c2c50 apply --cached: do not check newly added file in the working tree 19 years ago
Junio C Hamano 04e4888e5a apply --cached: apply a patch without using working tree. 19 years ago
Junio C Hamano 49e3343c9f apply --numstat: show new name, not old name. 19 years ago
Eric Wong dbd0f7d322 apply: fix infinite loop with multiple patches with --index 19 years ago
Junio C Hamano 0660626caf binary diff: further updates. 19 years ago
Junio C Hamano 051308f6e9 binary patch. 19 years ago
Junio C Hamano bad68ec924 index: make the index file format extensible. 19 years ago
Junio C Hamano 03ac6e6465 Invalidate cache-tree entries for touched paths in git-apply. 19 years ago
Eric W. Biederman 4749588713 Implement limited context matching in git-apply. 19 years ago
Peter Eriksen 90321c106c Replace xmalloc+memset(0) with xcalloc. 19 years ago
Peter Eriksen 8e44025925 Use blob_, commit_, tag_, and tree_type throughout. 19 years ago