Git https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v1.8.0.2 2012-05-09T21:08:42Z 2012-05-09T21:08:42Z René Scharfe rene.scharfe@lsrfire.ath.cx 2012-05-09T20:24:34Z urn:sha1:3319e606336c13ba6475d83e700ca53537cedfd9 The functions are unused now, remove them. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2010-05-04T22:20:47Z Junio C Hamano gitster@pobox.com 2010-05-04T22:20:47Z urn:sha1:6b6f5d4664c9088636418653a61f600b5e3a9ea4 * maint-1.7.0: remove ecb parameter from xdi_diff_outf() 2010-05-04T22:19:14Z René Scharfe rene.scharfe@lsrfire.ath.cx 2010-05-04T20:41:34Z urn:sha1:dfea79004c54bc96143386d6ac22de500ba4f747 xdi_diff_outf() overrides the structure members of its last parameter, ignoring any value that callers pass in. It's no surprise then that all callers pass a pointer to an uninitialized structure. They also don't read it after the call, so the parameter is neither used for input nor for output. Turn it into a local variable of xdi_diff_outf(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2010-02-17T23:11:33Z Michael Lukashov michael.lukashov@gmail.com 2010-02-16T23:42:55Z urn:sha1:06b65939b083ba1b71043005bf83b4883e98264e The following function is duplicated: fill_mm Move it to xdiff-interface.c and rename it 'read_mmblob', as suggested by Junio C Hamano. Also, change parameters order for consistency with read_mmfile(). Signed-off-by: Michael Lukashov <michael.lukashov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-07-02T02:16:37Z René Scharfe rene.scharfe@lsrfire.ath.cx 2009-07-01T22:01:43Z urn:sha1:8cfe5f1cd5dabc3a21bc792327747deefeff6dff xdiff_set_find_func() is used to set user defined regular expressions for finding function signatures. Add xdiff_clear_find_func(), which frees the memory allocated by the former, making the API complete. Also, use the new function in diff.c (the only call site of xdiff_set_find_func()) to clean up after ourselves. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2008-10-25T19:09:31Z René Scharfe rene.scharfe@lsrfire.ath.cx 2008-10-25T13:31:15Z urn:sha1:86295bb6bac1482d29650d1f77f19d8e7a7cc2fe Based on a patch by Brian Downing, this uses the xdiff emit_func feature to implement xdi_diff_hunks(). It's a function that calls a callback for each hunk of a diff, passing its lengths. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2008-09-29T18:04:20Z Shawn O. Pearce spearce@spearce.org 2008-09-29T18:04:20Z urn:sha1:9800c0df412869c7949935b61581b9361fc49bd1 * bc/master-diff-hunk-header-fix: Clarify commit error message for unmerged files Use strchrnul() instead of strchr() plus manual workaround Use remove_path from dir.c instead of own implementation Add remove_path: a function to remove as much as possible of a path git-submodule: Fix "Unable to checkout" for the initial 'update' Clarify how the user can satisfy stash's 'dirty state' check. t4018-diff-funcname: test syntax of builtin xfuncname patterns t4018-diff-funcname: test syntax of builtin xfuncname patterns make "git remote" report multiple URLs diff hunk pattern: fix misconverted "\{" tex macro introducers diff: fix "multiple regexp" semantics to find hunk header comment diff: use extended regexp to find hunk headers diff: use extended regexp to find hunk headers diff.*.xfuncname which uses "extended" regex's for hunk header selection diff.c: associate a flag with each pattern and use it for compiling regex diff.c: return pattern entry pointer rather than just the hunk header pattern Conflicts: builtin-merge-recursive.c t/t7201-co.sh xdiff-interface.h 2008-09-29T17:15:07Z Shawn O. Pearce spearce@spearce.org 2008-09-29T17:04:21Z urn:sha1:9ba929ed652f5ed7707f1c684999af4ad02c4925 * jc/better-conflict-resolution: Fix AsciiDoc errors in merge documentation git-merge documentation: describe how conflict is presented checkout --conflict=<style>: recreate merge in a non-default style checkout -m: recreate merge when checking out of unmerged index git-merge-recursive: learn to honor merge.conflictstyle merge.conflictstyle: choose between "merge" and "diff3 -m" styles rerere: understand "diff3 -m" style conflicts with the original rerere.c: use symbolic constants to keep track of parsing states xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less xmerge.c: minimum readability fixups xdiff-merge: optionally show conflicts in "diff3 -m" style xdl_fill_merge_buffer(): separate out a too deeply nested function checkout --ours/--theirs: allow checking out one side of a conflicting merge checkout -f: allow ignoring unmerged paths when checking out of the index Conflicts: Documentation/git-checkout.txt builtin-checkout.c builtin-merge-recursive.c t/t7201-co.sh 2008-09-19T03:32:50Z Junio C Hamano gitster@pobox.com 2008-09-19T03:32:50Z urn:sha1:dde4af4313c6fba5269df384d97ef4fa3ab5971d * bc/maint-diff-hunk-header-fix: diff.*.xfuncname which uses "extended" regex's for hunk header selection diff.c: associate a flag with each pattern and use it for compiling regex diff.c: return pattern entry pointer rather than just the hunk header pattern Cosmetical command name fix Start conforming code to "git subcmd" style part 3 t9700/test.pl: remove File::Temp requirement t9700/test.pl: avoid bareword 'STDERR' in 3-argument open() GIT 1.6.0.2 Fix some manual typos. Use compatibility regex library also on FreeBSD Use compatibility regex library also on AIX Update draft release notes for 1.6.0.2 Use compatibility regex library for OSX/Darwin git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl Git.pm: Use File::Temp->tempfile instead of ->new t7501: always use test_cmp instead of diff Start conforming code to "git subcmd" style part 2 diff: Help "less" hide ^M from the output checkout: do not check out unmerged higher stages randomly Conflicts: Documentation/git.txt Documentation/gitattributes.txt Makefile diff.c t/t7201-co.sh 2008-09-19T03:06:23Z Brandon Casey casey@nrlssc.navy.mil 2008-09-18T22:42:48Z urn:sha1:a013585b20ac757b0e75a72181ffa44674f35235 This is in preparation for allowing extended regular expression patterns. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>