On Fri, May 9, 2014 at 11:50 AM, Jonathan Nieder <jrnie...@gmail.com> wrote:
> Hi Tim,
> Tim Henigan wrote:
>> On Thu, May 8, 2014 at 5:58 PM, Felipe Contreras
>> <felipe.contre...@gmail.com> wrote:
>>> contrib/diffall/README | 31 ------
>>> contrib/diffall/git-diffall | 257
>>> 2 files changed, 288 deletions(-)
>>> delete mode 100644 contrib/diffall/README
>>> delete mode 100755 contrib/diffall/git-diffall
>> I see no problem with removing this script from contrib. However, the
>> commit message
>> should mention that git-difftool learned all the features of git-diffall
>> when the '--dir-diff'
>> option was added in v1.7.11 (ca. June 2012).
> A few questions:
> * Do you still use git-diffall? Since it hasn't been a maintenance
> burden, I wouldn't mind keeping it if it still has users.
I have not used diffall since a few months after the difftool '--dir-diff'
option was released. Once difftool learned those features, the
diffall script became obsolete.
For people using older git (i.e. before v1.7.11), it may still be useful.
For them, the original out-of-tree repo remains available on github .
> * Any thoughts about how to help people who have been using it to
> migrate to difftool? Would a note in the release notes to look
> into the --dir-diff option to difftool be enough, or are there
> more specific pointers that could be useful?
Pointing to 'difftool --dir-diff' should be enough.
The only change in behavior is that when a working tree file is part
of the diff and is modified during the diff, 'difftool --dir-diff' automatically
keeps the modifications. The 'diffall' script required the user to use
the '--copy-back' option to do the same.
All other options are exactly the same.
> Once those questions are dealt with, this seems like a nice small
> cleanup. Thanks for the quick feedback.
If it would be helpful, I can send a patch that replaces the contents
of 'contrib/diffall' with a README that explains the above and points
to the github repo for people using versions of git prior to v1.7.11.
This would be similar to what was done for 'contrib/vim'.
However, I like the idea of simply removing the directory from contrib
and pointing to 'difftool --dir-diff' in the release notes.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html