Re: git-apply working on an index with smudged entries

2018-12-14 Thread Junio C Hamano
Christian Halstrick writes: > Question: > - is this because the index which jgit created is so corrupt that only > special commands > like "git status" can repair it? No. > - or is "git apply" not trying hard enough to consume a index with > smudged entries No. Lower level "plumbing" commands

git-apply working on an index with smudged entries

2018-12-14 Thread Christian Halstrick
I see that when I call "git apply --3way ..." on an index which was previously created by JGit and which contains smudged entries the command fails with message "error: foo.txt: does not match index". If I do a "git status" afterwards and then the same "git apply --3way ..." it succeeds. Looks like