aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-apply.c
AgeCommit message (Expand)AuthorFilesLines
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-3670/+0
2010-02-03Typofixes outside documentation areaJunio C Hamano1-1/+1
2010-01-20Merge branch 'ag/patch-header-verify'Junio C Hamano1-1/+1
2010-01-20Merge branch 'ag/maint-apply-too-large-p'Junio C Hamano1-2/+9
2010-01-18builtin-apply.c: fix the --- and +++ header filename consistency checkAndreas Gruenbacher1-1/+1
2010-01-18builtin-apply.c: Skip filenames without enough componentsAndreas Gruenbacher1-2/+9
2010-01-13Merge branch 'nd/sparse'Junio C Hamano1-1/+1
2009-12-14ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDNguyễn Thái Ngọc Duy1-1/+1
2009-11-26builtin-apply.c: pay attention to -p<n> when determining the nameJunio C Hamano1-2/+3
2009-11-15Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano1-19/+42
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano1-19/+42
2009-09-04apply --whitespace: warn blank but not necessarily empty lines at EOFJunio C Hamano1-2/+4
2009-09-04apply --whitespace=warn/error: diagnose blank at EOFJunio C Hamano1-9/+18
2009-09-04apply.c: split check_whitespace() into twoJunio C Hamano1-9/+15
2009-09-04apply --whitespace=fix: detect new blank lines at eof correctlyJunio C Hamano1-0/+6
2009-09-04apply --whitespace=fix: fix handling of blank lines at the eofJunio C Hamano1-1/+1
2009-09-01builtin-apply.c: get rid of an unnecessary use of temporary arrayJunio C Hamano1-8/+6
2009-08-21Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano1-7/+166
2009-08-05git apply: option to ignore whitespace differencesGiuseppe Bilotta1-7/+166
2009-07-11apply: notice creation/removal patches produced by GNU diffJunio C Hamano1-1/+81
2009-07-06Merge branch 'tr/die_errno'Junio C Hamano1-6/+6
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast1-3/+3
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast1-3/+3
2009-06-20Fix various sparse warnings in the git source codeLinus Torvalds1-1/+1
2009-06-06parse-options: simplify usage argh handlingStephen Boyd1-2/+4
2009-05-31Merge branch 'sb/opt-filename'Junio C Hamano1-5/+2
2009-05-31Merge branch 'mm/apply-double-slash'Junio C Hamano1-6/+20
2009-05-29Merge branch 'sb/maint-1.6.2-opt-filename-fix'Junio C Hamano1-0/+4
2009-05-25parse-opts: add OPT_FILENAME and transition builtinsStephen Boyd1-4/+1
2009-05-25parse-opts: prepare for OPT_FILENAMEStephen Boyd1-1/+1
2009-05-25Merge branch 'master' into sb/opt-filenameJunio C Hamano1-15/+14
2009-05-24apply: handle filenames with double slashes betterMichal Marek1-6/+20
2009-05-23apply, fmt-merge-msg: use relative filenamesStephen Boyd1-0/+4
2009-04-29replace direct calls to unlink(2) with unlink_or_warnAlex Riesen1-2/+2
2009-04-20builtin-apply: keep information about files to be deletedMichał Kiedrowicz1-7/+46
2009-04-16git-apply: fix option descriptionUlrich Windl1-1/+1
2009-04-15builtin-apply: keep information about files to be deletedMichał Kiedrowicz1-7/+46
2009-03-23builtin-apply: use warning() instead of fprintf(stderr, "warning: ")Miklos Vajna1-8/+7
2009-03-18apply: hide unused options from short helpMichele Ballabio1-4/+4
2009-03-18apply: consistent spelling of "don't"Michele Ballabio1-1/+1
2009-02-09lstat_cache(): swap func(length, string) into func(string, length)Kjetil Barvik1-1/+1
2009-02-04Merge branch 'maint'Junio C Hamano1-1/+1
2009-02-03Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+1
2009-02-03apply: fix access to an uninitialized mode variable, found by valgrindJohannes Schindelin1-1/+1
2009-01-31Merge branch 'jc/maint-apply-fix'Junio C Hamano1-1/+1
2009-01-28builtin-apply.c: do not set bogus mode in check_preimage() for deleted pathJunio C Hamano1-1/+1
2009-01-21Merge branch 'lt/maint-wrap-zlib'Junio C Hamano1-2/+3
2009-01-17Merge branch 'mv/apply-parse-opt'Junio C Hamano1-126/+140
2009-01-13Merge branch 'ap/maint-apply-modefix' into maintJunio C Hamano1-1/+3
2009-01-11Wrap inflate and other zlib routines for better error reportingLinus Torvalds1-2/+3
2009-01-09Resurrect "git apply --flags -" to read from the standard inputJunio C Hamano1-14/+5
2009-01-03Merge branch 'ap/maint-apply-modefix'Junio C Hamano1-1/+3
2009-01-02builtin-apply: prevent non-explicit permission changesJunio C Hamano1-1/+3
2008-12-30parse-opt: migrate builtin-apply.Miklos Vajna1-129/+152
2008-12-17Add generic 'strbuf_readlink()' helper functionLinus Torvalds1-4/+2
2008-10-26Merge branch 'ar/maint-mksnpath' into HEADJunio C Hamano1-2/+2
2008-10-26Fix potentially dangerous uses of mkpath and git_pathAlex Riesen1-2/+2
2008-10-12Merge branch 'maint'Shawn O. Pearce1-0/+7
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey1-18/+8
2008-10-12git apply --directory broken for new filesJeff King1-0/+7
2008-10-09Merge branch 'maint'Shawn O. Pearce1-1/+1
2008-10-09builtin-apply: fix typo leading to stack corruptionImre Deak1-1/+1
2008-10-06do not segfault if make_cache_entry failedDmitry Potapov1-0/+2
2008-10-06do not segfault if make_cache_entry failedDmitry Potapov1-0/+2
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce1-9/+2
2008-09-29Use remove_path from dir.c instead of own implementationAlex Riesen1-9/+2
2008-09-06git-apply:--include=pathspecJunio C Hamano1-15/+33
2008-09-03Merge branch 'ho/dashless' into maintJunio C Hamano1-4/+4
2008-08-31'git foo' program identifies itself without dash in die() messagesJunio C Hamano1-3/+3
2008-08-30Start conforming code to "git subcmd" styleHeikki Orsila1-1/+1
2008-08-30git-apply: Loosen "match_beginning" logicJunio C Hamano1-1/+4
2008-07-21Rename path_list to string_listJohannes Schindelin1-8/+8
2008-07-13Make usage strings dash-lessStephan Beyer1-1/+1
2008-07-09apply: fix copy/rename breakageJunio C Hamano1-3/+7
2008-07-09Merge branch 'js/apply-root'Junio C Hamano1-0/+24
2008-07-06git-apply --directory: make --root more similar to GNU diffJunio C Hamano1-2/+2
2008-07-05Fix apply --recount handling of no-EOL lineThomas Rast1-1/+1
2008-07-02apply --root: thinkofix.Junio C Hamano1-2/+2
2008-07-01Teach "git apply" to prepend a prefix with "--root=<root>"Johannes Schindelin1-0/+24
2008-07-01Merge branch 'js/apply-recount'Junio C Hamano1-7/+68
2008-07-01Merge branch 'jc/checkdiff'Junio C Hamano1-3/+2
2008-06-28Allow git-apply to recount the lines in a hunk (AKA recountdiff)Johannes Schindelin1-7/+68
2008-06-27git-apply: handle a patch that touches the same path more than once betterDon Zickus1-10/+72
2008-06-26check_and_emit_line(): rename and refactorJunio C Hamano1-3/+2
2008-05-25Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano1-3/+3
2008-05-17builtin-apply: do not declare patch is creation when we do not know itJunio C Hamano1-15/+0
2008-05-17builtin-apply: accept patch to an empty fileJunio C Hamano1-56/+77
2008-05-17builtin-apply: typofixJunio C Hamano1-1/+1
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin1-3/+3
2008-05-10Optimize symlink/directory detectionLinus Torvalds1-1/+1
2008-04-16Merge branch 'maint'Junio C Hamano1-1/+1
2008-04-16Merge branch 'maint-1.5.4' into maintJunio C Hamano1-1/+1
2008-04-15builtin-apply: Show a more descriptive error on failure when opening a patchAlberto Bertogli1-1/+1
2008-04-14builtin-apply.c: use git_config_string() to get apply_default_whitespaceStephan Beyer1-6/+2
2008-04-06Merge branch 'jc/maint-apply-match-beginning'Junio C Hamano1-13/+16
2008-04-06Fix "git apply" to correctly enforce "match at the beginning"Junio C Hamano1-13/+16
2008-03-26Always set *nongit_ok in setup_git_directory_gently()SZEDER Gábor1-1/+1
2008-02-24Merge branch 'jc/apply-whitespace'Junio C Hamano1-243/+476
2008-02-23ws_fix_copy(): move the whitespace fixing function to ws.cJunio C Hamano1-108/+3
2008-02-16Merge branch 'sp/safecrlf'Junio C Hamano1-1/+1
2008-02-11Merge branch 'lt/in-core-index'Junio C Hamano1-5/+5
2008-02-11apply: do not barf on patch with too large an offsetJunio C Hamano1-0/+3
2008-02-11builtin-apply.c: guard config parser from value=NULLJunio C Hamano1-0/+2
2008-02-06safecrlf: Add mechanism to warn about irreversible crlf conversionsSteffen Prohaska1-1/+1
2008-02-05core.whitespace: cr-at-eolJunio C Hamano1-4/+14
2008-02-05git-apply --whitespace=fix: fix whitespace fuzz introduced by previous runJunio C Hamano1-5/+128
2008-02-05builtin-apply.c: pass ws_rule down to match_fragment()Junio C Hamano1-3/+5
2008-02-05builtin-apply.c: move copy_wsfix() function a bit higher.Junio C Hamano1-94/+94
2008-02-05builtin-apply.c: do not feed copy_wsfix() leading '+'Junio C Hamano1-20/+18
2008-02-05builtin-apply.c: simplify calling site to apply_line()Junio C Hamano1-18/+20
2008-02-05builtin-apply.c: clean-up apply_one_fragment()Junio C Hamano1-28/+27
2008-02-05builtin-apply.c: mark common context lines in lineinfo structure.Junio C Hamano1-25/+32
2008-02-05builtin-apply.c: optimize match_beginning/end processing a bit.Junio C Hamano1-0/+10
2008-02-05builtin-apply.c: make it more line orientedJunio C Hamano1-123/+280
2008-02-05builtin-apply.c: push match-beginning/end logic downJunio C Hamano1-14/+32
2008-02-05builtin-apply.c: restructure "offset" matchingJunio C Hamano1-24/+25
2008-02-05builtin-apply.c: refactor small part that matches contextJunio C Hamano1-5/+13
2008-01-21Make on-disk index representation separate from in-core oneLinus Torvalds1-5/+5
2008-01-16Improve use of lockfile APIBrandon Casey1-1/+1
2008-01-08"git-apply --check" should not report "fixed"Junio C Hamano1-1/+1
2007-12-16builtin-apply: stronger indent-with-on-tab fixingJ. Bruce Fields1-2/+1
2007-12-16builtin-apply: minor cleanup of whitespace detectionJ. Bruce Fields1-4/+4
2007-12-13Make "diff --check" output match "git apply"Wincent Colaiuta1-2/+2
2007-12-13Unify whitespace checkingWincent Colaiuta1-44/+10
2007-12-09Merge branch 'jc/spht'Junio C Hamano1-83/+155
2007-12-06Use gitattributes to define per-path whitespace ruleJunio C Hamano1-14/+22
2007-11-24core.whitespace: documentation updates.Junio C Hamano1-1/+1
2007-11-24builtin-apply: teach whitespace_rulesJunio C Hamano1-19/+49
2007-11-23builtin-apply: rename "whitespace" variables and fix stylesJunio C Hamano1-57/+91
2007-11-15Remove unreachable statementsGuido Ostkamp1-1/+0
2007-11-14Merge branch 'jc/maint-add-sync-stat'Junio C Hamano1-1/+1
2007-11-10ce_match_stat, run_diff_files: use symbolic constants for readabilityJunio C Hamano1-1/+1
2007-10-22Correct some sizeof(size_t) != sizeof(unsigned long) typing errorsRené Scharfe1-1/+1
2007-10-03builtin-apply: fix conversion error in strbuf seriesJunio C Hamano1-1/+1
2007-10-03Merge branch 'ph/strbuf'Junio C Hamano1-302/+183
2007-09-29Make read_patch_file work on a strbuf.Pierre Habouzit1-16/+11
2007-09-29strbuf_read_file enhancement, and use it.Pierre Habouzit1-10/+2
2007-09-29strbuf change: be sure ->buf is never ever NULL.Pierre Habouzit1-9/+7
2007-09-26apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin1-13/+22
2007-09-20Full rework of quote_c_style and write_name_quoted.Pierre Habouzit1-47/+30
2007-09-20Rework unquote_c_style to work on a strbuf.Pierre Habouzit1-61/+62
2007-09-19builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.Junio C Hamano1-0/+1
2007-09-18Use xmemdupz() in many places.Pierre Habouzit1-9/+2
2007-09-18Merge branch 'master' into ph/strbufJunio C Hamano1-8/+35
2007-09-18apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin1-13/+22
2007-09-18Merge branch 'maint'Junio C Hamano1-1/+1
2007-09-18Fix lapsus in builtin-apply.cPierre Habouzit1-1/+1
2007-09-18Merge branch 'cr/reset'Junio C Hamano1-2/+0
2007-09-17git-apply: fix whitespace strippingJ. Bruce Fields1-3/+10
2007-09-16apply --index-info: fall back to current index for mode changesJohannes Schindelin1-2/+24
2007-09-16builtin-apply: use strbuf's instead of buffer_desc's.Pierre Habouzit1-140/+72
2007-09-16Now that cache.h needs strbuf.h, remove useless includes.Pierre Habouzit1-1/+0
2007-09-16Rewrite convert_to_{git,working_tree} to use strbuf's.Pierre Habouzit1-14/+13
2007-09-14Simplify cache APIJunio C Hamano1-2/+0
2007-09-10Strbuf API extensions and fixes.Pierre Habouzit1-2/+2
2007-09-06Use strbuf API in apply, blame, commit-tree and diffPierre Habouzit1-21/+9
2007-09-05git-apply: do not read past the end of bufferJunio C Hamano1-1/+2
2007-08-15git-apply: apply submodule changesSven Verdoolaege1-25/+86
2007-08-06Merge branch 'maint'Junio C Hamano1-1/+1
2007-08-06apply: remove directory that becomes empty by renaming the last file awayLinus Torvalds1-1/+1
2007-07-07Merge branch 'maint'Junio C Hamano1-1/+5
2007-07-07Fix "apply --reverse" with regard to whitespaceJohannes Schindelin1-1/+5
2007-06-02git-apply: what is detected and fixed is not just trailing spaces.Junio C Hamano1-9/+8
2007-05-20git-apply: Fix removal of new trailing blank lines.Junio C Hamano1-33/+15
2007-05-20Teach 'git-apply --whitespace=strip' to remove empty lines at the end of fileMarco Costalba1-3/+40
2007-05-15Ensure return value from xread() is always stored into an ssize_tJohan Herland1-2/+2
2007-05-11apply: do not get confused by symlinks in the middleJunio C Hamano1-9/+26
2007-04-21Merge branch 'jc/attr'Junio C Hamano1-11/+7
2007-04-20Simplify calling of CR/LF conversion routinesAlex Riesen1-11/+7
2007-04-18Merge branch 'maint'Junio C Hamano1-2/+1
2007-04-18Fix overwriting of files when applying contextually independent diffsAlex Riesen1-2/+1
2007-04-07Merge branch 'jc/index-output'Junio C Hamano1-3/+3
2007-04-05Merge branch 'maint'Junio C Hamano1-2/+2
2007-04-05Rename static variable write_index to update_index in builtin-apply.cJunio C Hamano1-6/+6
2007-04-05Honor -p<n> when applying git diffsShawn O. Pearce1-2/+2
2007-04-03_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Junio C Hamano1-3/+3
2007-03-22git-apply: Do not free the wrong buffer when we convert the data for writeoutJunio C Hamano1-7/+10
2007-03-07Cast 64 bit off_t to 32 bit size_tShawn O. Pearce1-1/+1
2007-03-02Add core.symlinks to mark filesystems that do not support symbolic links.Johannes Sixt1-1/+1
2007-02-27convert object type handling from a string to a numberNicolas Pitre1-4/+4
2007-02-27Merge branch 'maint'Junio C Hamano1-1/+2
2007-02-27git-apply: do not fix whitespaces on context lines.Junio C Hamano1-1/+2
2007-02-24Merge branch 'js/apply'Junio C Hamano1-1/+6
2007-02-22Merge branches 'lt/crlf' and 'jc/apply-config'Junio C Hamano1-22/+133
2007-02-22apply: make --verbose a little more usefulJohannes Schindelin1-1/+6
2007-02-21git-apply: guess correct -p<n> value for non-git patches.Junio C Hamano1-2/+57
2007-02-21git-apply: notice "diff --git" patch againJunio C Hamano1-7/+16
2007-02-21Fix botched "leak fix"Junio C Hamano1-2/+8
2007-02-20Mechanical conversion to use prefixcmp()Junio C Hamano1-6/+6
2007-02-19apply: fix memory leak in prefix_one()Johannes Schindelin1-6/+9
2007-02-19git-apply: require -p<n> when working in a subdirectory.Junio C Hamano1-14/+28
2007-02-19git-apply: do not lose cwd when run from a subdirectory.Junio C Hamano1-4/+4
2007-02-18Teach 'git apply' to look at $HOME/.gitconfig even outside of a repositoryJunio C Hamano1-5/+3
2007-02-17Teach core.autocrlf to 'git apply'Junio C Hamano1-6/+28
2007-02-17Teach 'git apply' to look at $GIT_DIR/configJunio C Hamano1-8/+13
2007-02-16Do not take mode bits from index after type change.Junio C Hamano1-1/+1
2007-01-20apply --cached: fix crash in subdirectoryJohannes Schindelin1-1/+1
2007-01-09git-apply: Remove directories that have become empty after deleting a file.Alexandre Julliard1-2/+13
2007-01-09Merge branch 'maint'Junio C Hamano1-1/+2
2007-01-09Fix "Do not ignore a detected patchfile brokenness."Junio C Hamano1-1/+2
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-04 09:44:42 +0000