GNU bug report logs - #42145
vc-git file order mismatch between vc-dir and vc-diff

Previous Next

Full log

View this message in rfc822 format

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Juri Linkov <juri <at> linkov.net>
Cc: 42145 <at> debbugs.gnu.org
Subject: bug#42145: vc-git file order mismatch between vc-dir and vc-diff
Date: Thu, 2 Jul 2020 01:44:15 +0300

On 02.07.2020 00:44, Juri Linkov wrote:
>> 'git diff' has a '-O' argument, which accepts <orderfile>. Maybe
>> it'll help, but I kind of doubt that. Ideas welcome.

> Maybe it's possible to write a diff-mode function to sort file hunks
> in
> vc-diff output buffer?  Maybe by just giving the right file-beginning
> regexp to sort-subr?

Which sort-subr?

Overall, it sounds possible. But I would be careful about making the 
display of long diffs slower.

>> The idea is, you open a diff, maybe split some of the hunks, kill the ones
>> you don't need (diff-mode supports all these operations), and then commit
>> the remaining ones, from multiple files, if needed. Seems like a good
>> replacement for 'git add -p' for Emacs power users.
> But I wonder how it could handle binary files where git-diff output says just
> "Binary files differ".

Perhaps it wouldn't.

Or perhaps it would check them in wholesale, without choosing individual 
pieces inside.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.