Junio C Hamano venit, vidit, dixit 19.06.2015 19:03:
Michael J Gruber g...@drmicha.warpmail.net writes:
Now, since external diff runs on smudged blobs, it appears as if we
mixed cleaned and smudged blobs when feeding external diffs; whereas
really, we mix worktree blobs and smudged repo
On Fri, Jun 19, 2015 at 10:57:55AM +0200, Michael J Gruber wrote:
Junio C Hamano venit, vidit, dixit 19.06.2015 00:55:
John Keeping j...@keeping.me.uk writes:
I think the summary is that there are some scenarios where the external
diff tool should see the smudged version and others where
Junio C Hamano venit, vidit, dixit 19.06.2015 00:55:
John Keeping j...@keeping.me.uk writes:
I think the summary is that there are some scenarios where the external
diff tool should see the smudged version and others where the clean
version is more appropriate and Git should support both
2015-06-19 11:32 GMT+02:00 John Keeping j...@keeping.me.uk:
On Fri, Jun 19, 2015 at 10:57:55AM +0200, Michael J Gruber wrote:
Junio C Hamano venit, vidit, dixit 19.06.2015 00:55:
John Keeping j...@keeping.me.uk writes:
I think the summary is that there are some scenarios where the external
Michael J Gruber g...@drmicha.warpmail.net writes:
Now, since external diff runs on smudged blobs, it appears as if we
mixed cleaned and smudged blobs when feeding external diffs; whereas
really, we mix worktree blobs and smudged repo blobs, which is okay
as per our definition of
2015-06-18 15:26 GMT+02:00 John Keeping j...@keeping.me.uk:
[Please don't top-post on this list.]
On Thu, Jun 18, 2015 at 03:15:38PM +0200, Florian Aspart wrote:
2015-06-18 14:31 GMT+02:00 Michael J Gruber g...@drmicha.warpmail.net:
Florian Aspart venit, vidit, dixit 16.06.2015 16:11:
Hi
Florian Aspart venit, vidit, dixit 16.06.2015 16:11:
Hi everyone,
I created a clean filter to apply on some files before commiting them.
The filter works correctly when I commit the file and is also applied
when I usethe iff command line tool.
However, when using difftool with meld, the
Hi Michael,
yes in this case difftool compares an uncleaned working tree file
with a cleaned blob. I did not try the smudge filter to see if it
applied in difftool.
I think the problem comes from the way difftool is feeded, since I
also had this problem when setting an external tool for the diff
[Please don't top-post on this list.]
On Thu, Jun 18, 2015 at 03:15:38PM +0200, Florian Aspart wrote:
2015-06-18 14:31 GMT+02:00 Michael J Gruber g...@drmicha.warpmail.net:
Florian Aspart venit, vidit, dixit 16.06.2015 16:11:
Hi everyone,
I created a clean filter to apply on some files
2015-06-18 16:11 GMT+02:00 John Keeping j...@keeping.me.uk:
On Thu, Jun 18, 2015 at 03:51:25PM +0200, Florian Aspart wrote:
2015-06-18 15:26 GMT+02:00 John Keeping j...@keeping.me.uk:
[Please don't top-post on this list.]
On Thu, Jun 18, 2015 at 03:15:38PM +0200, Florian Aspart wrote:
2015-06-18 16:28 GMT+02:00 John Keeping j...@keeping.me.uk:
On Thu, Jun 18, 2015 at 04:17:52PM +0200, Florian Aspart wrote:
2015-06-18 16:11 GMT+02:00 John Keeping j...@keeping.me.uk:
On Thu, Jun 18, 2015 at 03:51:25PM +0200, Florian Aspart wrote:
2015-06-18 15:26 GMT+02:00 John Keeping
On Thu, Jun 18, 2015 at 04:17:52PM +0200, Florian Aspart wrote:
2015-06-18 16:11 GMT+02:00 John Keeping j...@keeping.me.uk:
On Thu, Jun 18, 2015 at 03:51:25PM +0200, Florian Aspart wrote:
2015-06-18 15:26 GMT+02:00 John Keeping j...@keeping.me.uk:
[Please don't top-post on this list.]
On Thu, Jun 18, 2015 at 03:51:25PM +0200, Florian Aspart wrote:
2015-06-18 15:26 GMT+02:00 John Keeping j...@keeping.me.uk:
[Please don't top-post on this list.]
On Thu, Jun 18, 2015 at 03:15:38PM +0200, Florian Aspart wrote:
2015-06-18 14:31 GMT+02:00 Michael J Gruber
On Thu, Jun 18, 2015 at 05:39:18PM +0200, Florian Aspart wrote:
2015-06-18 16:28 GMT+02:00 John Keeping j...@keeping.me.uk:
On Thu, Jun 18, 2015 at 04:17:52PM +0200, Florian Aspart wrote:
2015-06-18 16:11 GMT+02:00 John Keeping j...@keeping.me.uk:
On Thu, Jun 18, 2015 at 03:51:25PM +0200,
On Thu, Jun 18, 2015 at 01:00:36PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
I think this is a difference between git-diff's internal and external
diff modes which is working correctly, although possibly not desirably
in this case. The internal diff always uses
John Keeping j...@keeping.me.uk writes:
I think the summary is that there are some scenarios where the external
diff tool should see the smudged version and others where the clean
version is more appropriate and Git should support both options. It
seems this is a property of the filter, so I
John Keeping j...@keeping.me.uk writes:
I think this is a difference between git-diff's internal and external
diff modes which is working correctly, although possibly not desirably
in this case. The internal diff always uses clean files (so it runs the
working tree file through the clean
Hi everyone,
I created a clean filter to apply on some files before commiting them.
The filter works correctly when I commit the file and is also applied
when I usethe iff command line tool.
However, when using difftool with meld, the filter is not applied and
the different versions of the files
18 matches
Mail list logo
