delta/git.git/ll-merge.c, branch tg/index-struct-sizes

convert some config callbacks to parse_config_key

2013-01-23T16:41:50+00:00

These callers can drop some inline pointer arithmetic and
magic offset constants, making them more readable and less
error-prone (those constants had to match the lengths of
strings, but there is no automatic verification of that
fact).

The "ep" pointer (presumably for "end pointer"), which
points to the final key segment of the config variable, is
given the more standard name "key" to describe its function
rather than its derivation.

Signed-off-by: Jeff King 
Reviewed-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Merge branch 'jc/ll-merge-binary-ours'

2012-09-15T04:39:56+00:00

"git merge -Xtheirs" did not help content-level merge of binary
files; it should just take their version.  Also "*.jpg binary" in
the attributes did not imply they should use the binary ll-merge
driver.

* jc/ll-merge-binary-ours:
  ll-merge: warn about inability to merge binary files only when we can't
  attr: "binary" attribute should choose built-in "binary" merge driver
  merge: teach -Xours/-Xtheirs to binary ll-merge driver

ll-merge: warn about inability to merge binary files only when we can't

2012-09-12T09:01:52+00:00

When a path being merged is auto detected to be a binary file, we
warned "Cannot merge binary files" before switching to activate the
binary ll-merge driver.  When we are merging with the -Xours/theirs
option, however, we know what the "clean" merge result is, and the
warning is inappropriate.

In addition, when the path is explicitly marked as a binary file,
this warning was not issued, even though without -Xours/theirs, we
cannot cleanly automerge such a path, which was inconsistent.

Move the warning code from ll_xdl_merge() to ll_binary_merge(), and
issue the message only when we cannot cleanly automerge.

Signed-off-by: Junio C Hamano

merge: teach -Xours/-Xtheirs to binary ll-merge driver

2012-09-09T04:27:19+00:00

The (discouraged) -Xours/-Xtheirs modes of merge are supposed to
give a quick and dirty way to come up with a random mixture of
cleanly merged parts and punted conflict resolution to take contents
from one side in conflicting parts.  These options however were only
passed down to the low level merge driver for text.

Teach the built-in binary merge driver to notice them as well.

Signed-off-by: Junio C Hamano

remove superfluous newlines in error messages

2012-04-30T22:45:51+00:00

The error handling routines add a newline.  Remove
the duplicate ones in error messages.

Signed-off-by: Pete Wyckoff 
Signed-off-by: Junio C Hamano

Rename git_checkattr() to git_check_attr()

2011-08-04T22:53:21+00:00

Suggested by: Junio Hamano 

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

ll-merge: simplify opts == NULL case

2011-01-16T04:34:14+00:00

As long as sizeof(struct ll_merge_options) is small, there is not
much reason not to keep a copy of the default merge options in the BSS
section.  In return, we get clearer code and one less stack frame in
the opts == NULL case.

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

merge-recursive --patience

2010-08-26T16:20:03+00:00

Teach the merge-recursive strategy a --patience option to use the
"patience diff" algorithm, which tends to improve results when
cherry-picking a patch that reorders functions at the same time as
refactoring them.

To support this, struct merge_options and ll_merge_options gain an
xdl_opts member, so programs can use arbitrary xdiff flags (think
"XDF_IGNORE_WHITESPACE") in a git-aware merge.

git merge and git rebase can be passed the -Xpatience option to
use this.

[jn: split from --ignore-space patch; with documentation]

Signed-off-by: Justin Frankel 
Signed-off-by: Jonathan Nieder 
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

ll-merge: let caller decide whether to renormalize

2010-08-06T16:20:01+00:00

Add a “renormalize” bit to the ll-merge options word so callers can
decide on a case-by-case basis whether the merge is likely to have
overlapped with a change in smudge/clean rules.

This reveals a few commands that have not been taking that situation
into account, though it does not fix them.

No functional change intended.

Cc: Eyvind Bernhardsen 
Improved-by: Junio C Hamano 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano