more below. On 12/30/22, rsbecker@xxxxxxxxxxxxx <rsbecker@xxxxxxxxxxxxx> wrote: > On December 30, 2022 7:18 PM, Samuel Wales wrote: >>i am not subscribed, but am of the impression that's ok. please copy me >> directly. ... > I cannot account for your emacs issues, but have a question. Have you done > any git add operations? Git diff is subject to what specifically is staged. idk what this means. there is nothing in the staging area at this time, if that is relevant. > So you might be comparing your file with partially staged content that could > account for partial diffs. See if diff --cached makes a difference. Also try diff --cached produces nothing. 0 bytes. > different algorithms, like --patience or --diff-algorithm=histogram. i tried both with git 2.20. they produce different output from regular git diff. i looked for the paragraph i mentioned. in regular git diff, the problem is the same as i described, with - - +. in both patience and histogram, it is -. it occurs to me that, although unlikely, i might have in principle had a duplicate copy of those lines in A, and deleted one, and moved the other, when i created the current version, B. thus, i /think/ both regular and patience/histogram could be /in principle/ correct on that one point. to confirm, i will check rsnapshot using grep -c to count the matches in all versions of the original files. unless i report back, the number will be 1 in all of them, i.e. git diff and magit status buffer are both producing an incorrect diff. however, even if this is user error, i.e., i deleted a duplicate and moved it, the patience/histogram - result seems still incorrect: The next few commands work with both grub> and grub rescue>. -***************** REF bigpart is a partition -biglike and homelike are distracting nonsense i think except -to describe inferior filesets. anomalous subset of home -might be called homelike or so. 1) The first command you should run invokes the pager, for you can see here that the context lines are from a different org entry. it is intermingling a live - line with a context line that is not adjacent to it. that seems corrupt unless i, even more improbably, moved an entry from inside another entry. > > --Randall > > -- The Kafka Pandemic A blog about science, health, human rights, and misopathy: https://thekafkapandemic.blogspot.com
