delta/git.git/git-mergetool.sh, branch jk/trailers-parse

mergetool: fix running in subdir when rerere enabled

2017-01-10T21:22:51+00:00

"git mergetool" (without any pathspec on the command line) that is
not run from the top-level of the working tree no longer works in
Git v2.11, failing to get the list of unmerged paths from the output
of "git rerere remaining".  This regression was introduced by
57937f70a0 ("mergetool: honor diff.orderFile", 2016-10-07).

This is because the pathnames output by the 'git rerere remaining'
command are relative to the top-level directory but the 'git diff
--name-only' command expects its pathname arguments to be relative
to the current working directory.  To make everything consistent,
cd_to_toplevel before running 'git diff --name-only' and adjust any
relative pathnames.

Signed-off-by: Richard Hansen 
Signed-off-by: Junio C Hamano

mergetool: take the "-O" out of $orderfile

2017-01-10T21:22:20+00:00

This will make it easier for a future commit to convert a relative
orderfile pathname to either absolute or relative to the top-level
directory.  It also improves code readability.

Signed-off-by: Richard Hansen 
Signed-off-by: Junio C Hamano

mergetool: honor -O

2016-10-11T17:04:31+00:00

Teach mergetool to pass "-O" down to `git diff` when
specified on the command-line.

Helped-by: Johannes Sixt 
Signed-off-by: David Aguilar 
Reviewed-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

mergetool: honor diff.orderFile

2016-10-11T17:04:27+00:00

Teach mergetool to get the list of files to edit via `diff` so that we
gain support for diff.orderFile.

Suggested-by: Luis Gutierrez 
Helped-by: Johannes Sixt 
Signed-off-by: David Aguilar 
Reviewed-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

mergetool: move main program flow into a main() function

2016-10-11T17:04:23+00:00

Make it easier to follow the program's flow by isolating all
logic into functions.  Isolate the main execution code path into
a single unit instead of having prompt_after_failed_merge()
interrupt it partyway through.

The use of a main() function is borrowing a convention from C,
Python, Perl, and many other languages.  This helps readers more
familiar with other languages understand the purpose of each
function when diving into the codebase with fresh eyes.

Signed-off-by: David Aguilar 
Reviewed-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

mergetool: add copyright

2016-10-11T17:04:10+00:00

Signed-off-by: David Aguilar 
Reviewed-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

Merge branch 'nf/mergetool-prompt'

2016-05-03T21:08:17+00:00

UI consistency improvements.

* nf/mergetool-prompt:
  difftool/mergetool: make the form of yes/no questions consistent

difftool/mergetool: make the form of yes/no questions consistent

2016-04-25T22:15:17+00:00

Every yes/no question in difftool/mergetool scripts has slightly
different form, and none of them is consistent with the form git
itself uses.

Make the form of all the questions consistent with the form used
by git.

Reviewed-by: John Keeping 
Signed-off-by: Nikola Forró 
Acked-by: David Aguilar 
Signed-off-by: Junio C Hamano

mergetool: honor tempfile configuration when resolving delete conflicts

2016-03-10T22:07:57+00:00

Teach resolve_deleted_merge() to honor the mergetool.keepBackup and
mergetool.keepTemporaries configuration knobs.

This ensures that the worktree is kept pristine when resolving deletion
conflicts with the variables both set to false.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

mergetool: support delete/delete conflicts

2016-03-10T22:07:13+00:00

If two branches each move a file into different directories then
mergetool will fail because it assumes that the file being merged, and
its parent directory, are present in the worktree.

Create the merge file's parent directory to allow using the
deleted base version of the file for merge resolution when
encountering a delete/delete conflict.

The end result is that a delete/delete conflict is presented for the
user to resolve.

Reported-by: Joe Einertson 
Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano