git/xdiff-interface.c, branch v1.7.2

Merge branch 'maint-1.7.0' into maint

2010-05-04T22:20:47Z

* maint-1.7.0: remove ecb parameter from xdi_diff_outf()

remove ecb parameter from xdi_diff_outf()

2010-05-04T22:19:14Z

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 Acked-by: Jeff King Signed-off-by: Junio C Hamano

refactor duplicated fill_mm() in checkout and merge-recursive

2010-02-17T23:11:33Z

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 Signed-off-by: Junio C Hamano

userdiff: add xdiff_clear_find_func()

2009-07-02T02:16:37Z

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 Signed-off-by: Junio C Hamano

Remove unused function scope local variables

2009-03-08T04:52:17Z

These variables were unused and can be removed safely: builtin-clone.c::cmd_clone(): use_local_hardlinks, use_separate_remote builtin-fetch-pack.c::find_common(): len builtin-remote.c::mv(): symref diff.c::show_stats():show_stats(): total diffcore-break.c::should_break(): base_size fast-import.c::validate_raw_date(): date, sign fsck.c::fsck_tree(): o_sha1, sha1 xdiff-interface.c::parse_num(): read_some Signed-off-by: Benjamin Kramer Signed-off-by: Junio C Hamano

xdiff-interface.c: remove 10 duplicated lines

2008-11-26T18:47:41Z

Remove an accidentally duplicated sequence of 10 lines. This happens to plug a leak, too. Signed-off-by: Junio C Hamano

Merge branch 'rs/blame'

2008-11-09T00:05:39Z

* rs/blame: blame: use xdi_diff_hunks(), get rid of struct patch add xdi_diff_hunks() for callers that only need hunk lengths Allow alternate "low-level" emit function from xdl_diff Always initialize xpparam_t to 0 blame: inline get_patch()

add xdi_diff_hunks() for callers that only need hunk lengths

2008-10-25T19:09:31Z

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 Signed-off-by: Junio C Hamano

Merge branch 'maint'

2008-10-17T08:52:32Z

* maint: t1301-shared-repo.sh: don't let a default ACL interfere with the test git-check-attr(1): add output and example sections xdiff-interface.c: strip newline (and cr) from line before pattern matching t4018-diff-funcname: demonstrate end of line funcname matching flaw t4018-diff-funcname: rework negated last expression test Typo "does not exists" when git remote update remote. remote.c: correct the check for a leading '/' in a remote name Add testcase to ensure merging an early part of a branch is done properly Conflicts: t/t7600-merge.sh

xdiff-interface.c: strip newline (and cr) from line before pattern matching

2008-10-16T15:31:56Z

POSIX doth sayeth: "In the regular expression processing described in IEEE Std 1003.1-2001, the is regarded as an ordinary character and both a period and a non-matching list can match one. ... Those utilities (like grep) that do not allow s to match are responsible for eliminating any from strings before matching against the RE." Thus far git has not been removing the trailing newline from strings matched against regular expression patterns. This has the effect that (quoting Jonathan del Strother) "... a line containing just 'FUNCNAME' (terminated by a newline) will be matched by the pattern '^(FUNCNAME.$)' but not '^(FUNCNAME$)'", and more simply not '^FUNCNAME$'. Signed-off-by: Brandon Casey Signed-off-by: Shawn O. Pearce