Applying patch files get added to the index by default #104

lkerford · 2024-10-21T21:39:57Z

lkerford
Oct 21, 2024

When applying patches using jGit, by default it applies to patch to the associated files and the index. I was a bit surprised because this isn't the how git apply myPatch.patch acts but git apply --index myPatch.patch. Is there an option which we can opt in to get the the git apply myPatch.patch functionality?

lkerford · 2024-10-22T23:27:27Z

lkerford
Oct 22, 2024
Author

We can see that the indexes are being updated when we apply the patch when we commit the changes in the DirCache class. The file gets added to the diff when we move it over when its renamed (inside the tmp.commit call). I'm uncertain how we handle ignored files in other cases but it must be done much earlier because I didn't see any validation around if the file should or shouldn't be added to the commit

public boolean commit() {
  final LockFile tmp = myLock;
  requireLocked(tmp);
  myLock = null;
  if (!tmp.commit()) {
	  return false;
  }
  snapshot = tmp.getCommitSnapshot();
  if (indexChangedListener != null
		  && !Arrays.equals(readIndexChecksum, writeIndexChecksum)) {
	  indexChangedListener.onIndexChanged(new IndexChangedEvent(true));
  }
  return true;
}

0 replies

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Applying patch files get added to the index by default #104

Uh oh!

{{title}}

Uh oh!

Replies: 1 comment

Uh oh!

{{title}}

Uh oh!

Select a reply

Uh oh!

Applying patch files get added to the index by default #104

Uh oh!

lkerford Oct 21, 2024

Replies: 1 comment

Uh oh!

lkerford Oct 22, 2024 Author

lkerford
Oct 21, 2024

lkerford
Oct 22, 2024
Author