user/sven/git.git/git-difftool.perl, branch v1.8.3.3

difftool --dir-diff: allow changing any clean working tree file

2013-05-29T19:50:08Z

The temporary directory prepared by "difftool --dir-diff" to show the result of a change can be modified by the user via the tree diff program, and we try hard not to lose changes to them after tree diff program returns to us. However, the set of files to be copied back is computed differently between --symlinks and --no-symlinks modes. The former checks all paths that start out as identical to the working tree file, while the latter checks paths that already had a local modification in the working tree, allowing changes made in the tree diff program to paths that did not have any local change to be lost. Signed-off-by: Kenichi Saita Signed-off-by: Junio C Hamano

difftool: fix dir-diff when file does not exist in working tree

2013-05-17T18:46:53Z

Commit 02c5631 (difftool --dir-diff: symlink all files matching the working tree, 2013-03-14) does not handle the case where a file that is being compared does not exist in the working tree. Fix this by checking for existence explicitly before running git-hash-object. Reported-by: Kevin Bracey Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

difftool: don't overwrite modified files

2013-03-29T22:16:04Z

After running the user's diff tool, git-difftool will copy any files that differ between the working tree and the temporary tree. This is useful when the user edits the file in their diff tool but is wrong if they edit the working tree file while examining the diff. Instead of copying unconditionally when the files differ, create and index from the working tree files and only copy the temporary file back if it was modified and the working tree file was not. If both files have been modified, print a warning and exit with an error. Note that we cannot use an existing index in git-difftool since those contain the modified files that need to be checked out but here we are looking at those files which are copied from the working tree and not checked out. These are precisely the files which are not in the existing indices. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

Merge branch 'jk/difftool-dir-diff-edit-fix'

2013-03-28T21:37:22Z

"git difftool --dir-diff" made symlinks to working tree files when preparing a temporary directory structure, so that accidental edits of these files in the difftool are reflected back to the working tree, but the logic to decide when to do so was not quite right. * jk/difftool-dir-diff-edit-fix: difftool --dir-diff: symlink all files matching the working tree difftool: avoid double slashes in symlink targets git-difftool(1): fix formatting of --symlink description

difftool --dir-diff: symlink all files matching the working tree

2013-03-14T21:33:06Z

Some users like to edit files in their diff tool when using "git difftool --dir-diff --symlink" to compare against the working tree but difftool currently only created symlinks when a file contains unstaged changes. Change this behaviour so that symlinks are created whenever the right-hand side of the comparison has the same SHA1 as the file in the working tree. Note that textconv filters are handled in the same way as by git-diff and if a clean filter is not the inverse of its smudge filter we already get a null SHA1 from "diff --raw" and will symlink the file without going through the new hash-object based check. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

difftool: avoid double slashes in symlink targets

2013-03-14T21:29:05Z

When we add tests for symlinks in "git difftool --dir-diff" it's easier to check the target path if we don't have to worry about double slashes separating directories. Remove the trailing slash (if present) from $workdir before creating the symlinks in order to avoid this. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

difftool: silence uninitialized variable warning

2013-02-17T22:34:38Z

Git::config() returns `undef` when given keys that do not exist. Check that the $guitool value is defined to prevent a noisy "Use of uninitialized variable $guitool in length" warning. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

git-difftool: use git-mergetool--lib for "--tool-help"

2013-01-25T19:08:55Z

The "--tool-help" option to git-difftool currently displays incorrect output since it uses the names of the files in "$GIT_EXEC_PATH/mergetools/" rather than the list of command names in git-mergetool--lib. Fix this by simply delegating the "--tool-help" argument to the show_tool_help function in git-mergetool--lib. Signed-off-by: John Keeping Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: silence warning

2012-08-21T22:27:15Z

Silence a warning given when running git difftool --dir-diff and there are no changes. This is because command_oneline returns undef when the command has no output, not ''. Signed-off-by: Ross Lagerwall Acked-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Disable --symlinks on cygwin

2012-07-26T20:07:15Z

Symlinks are not ubiquitous on Windows so make --no-symlinks the default. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano