delta/git.git/merge-file.c, branch jk/diff-submodule-diff-inline

Which merge_file() function do you mean?

2012-12-10T07:05:27+00:00

There are two different static functions and one global function,
all of them called "merge_file()", with different signatures and
purposes.  Rename them all to reduce confusion in "git grep" output:

 * Rename the static one in merge-index to "merge_one_path(const char
   *path)" as that function is about asking an external command to
   resolve conflicts in one path.

 * Rename the global one in merge-file.c that is only used by
   merge-tree to "merge_blobs()", as the function takes three blobs and
   returns the merged result only in-core, without doing anything to
   the filesystem.

 * Rename the one in merge-recursive to "merge_one_file()", just to be
   fair.

Also rename merge-file.[ch] to merge-blobs.[ch].

Signed-off-by: Junio C Hamano

sparse: Fix an "symbol 'merge_file' not decared" warning

2011-04-11T17:35:25+00:00

In order to fix the warning, we add a new "merge-file.h" header
containing the extern declaration of the merge_file() function,
and include the header in the source files that require the
declaration.

Signed-off-by: Ramsay Jones 
Signed-off-by: Junio C Hamano

ll-merge: replace flag argument with options struct

2010-08-26T16:18:51+00:00

Keeping track of the flag bits is proving more trouble than it's
worth.  Instead, use a pointer to an options struct like most similar
APIs do.

Callers with no special requests can pass NULL to request the default
options.

Cc: Bert Wesarg 
Cc: Avery Pennarun 
Helped-by: Justin Frankel 
Helped-by: Bert Wesarg 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Merge branch 'rs/diff-no-minimal'

2010-06-13T18:20:46+00:00

* rs/diff-no-minimal:
  git diff too slow for a file

git diff too slow for a file

2010-05-02T14:59:50+00:00

Ever since the xdiff library had been introduced to git, all its callers
have used the flag XDF_NEED_MINIMAL.  It makes sure that the smallest
possible diff is produced, but that takes quite some time if there are
lots of differences that can be expressed in multiple ways.

This flag makes a difference for only 0.1% of the non-merge commits in
the git repo of Linux, both in terms of diff size and execution time.
The patches there are mostly nice and small.

SungHyun Nam however reported a case in a different repo where a diff
took more than 20 times longer to generate with XDF_NEED_MINIMAL than
without.  Rebasing became really slow.

This patch removes this flag from all callers.  The default of xdiff is
saner because it has minimal to no impact in the normal case of small
diffs and doesn't incur that much of a speed penalty for large ones.

A follow-up patch may introduce a command line option to set the flag if
the user needs it, similar to GNU diff's -d/--minimal.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

merge_file(): add comment explaining behavior wrt conflict style

2010-03-21T03:36:11+00:00

The merge_file() function is a helper for ‘git read-tree’, which does
not respect the merge.conflictstyle option, so there is no need to
worry about what ancestor_name it should pass to ll_merge().  Add a
comment to this effect.

Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

ll_merge(): add ancestor label parameter for diff3-style output

2010-03-21T03:36:11+00:00

Commands using the ll_merge() function will present conflict hunks
imitating ‘diff3 -m’ output if the merge.conflictstyle configuration
option is set appropriately.  Unlike ‘diff3 -m’, the output does not
include a label for the merge base on the ||||||| line of the output,
and some tools misparse the conflict hunks without that.

Add a new ancestor_label parameter to ll_merge() to give callers the
power to rectify this situation.  If ancestor_label is NULL, the output
format is unchanged.  All callers pass NULL for now.

Requested-by: Stefan Monnier 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

merge-tree: use ll_merge() not xdl_merge()

2010-01-17T07:45:33+00:00

ll_merge() interface was designed to merge contents under git control
while taking per-path attributes into account.  Update the three-way
merge implementation used by merge-tree to use it.

Signed-off-by: Junio C Hamano

xdl_merge(): introduce xmparam_t for merge specific parameters

2010-01-17T05:33:13+00:00

So far we have only needed to be able to pass an option that is generic to
xdiff family of functions to this function.  Extend the interface so that
we can give it merge specific parameters.

Signed-off-by: Junio C Hamano

Always initialize xpparam_t to 0

2008-10-25T19:09:31+00:00

We're going to be adding some parameters to this, so we can't have
any uninitialized data in it.

Signed-off-by: Brian Downing 
Signed-off-by: Junio C Hamano