Expose %(file_old), the filename before a rename or deletion#1132
Merged
koutcher merged 1 commit intojonas:masterfrom Oct 4, 2021
Merged
Expose %(file_old), the filename before a rename or deletion#1132koutcher merged 1 commit intojonas:masterfrom
koutcher merged 1 commit intojonas:masterfrom
Conversation
This improves interaction with external tools that require file names. Implemented by extending diff_get_pathname. We don't handle prefixes like "diff --cc" when computing %(file_old), because we can't tell yet if such a line is "old" or "new". Git only uses these combined headers for binary files, and other edge cases, see: PAGER='less +1206' git show 75ae10b:combine-diff.c Anyway, this is not really important because %(file) already has the correct name. An alternative (partial) solution would be to change %(file) to the old filename but only for deleted files. I decided against this; while it would be convenient for some basic scenarios, it hides information which makes scripting more difficult. Another, more general solution for these kinds of problems would be to allow to pipe the raw diff to user scripts.
vxsl
pushed a commit
to vxsl/tig
that referenced
this pull request
Mar 18, 2026
) This improves interaction with external tools that require file names. Implemented by extending diff_get_pathname. We don't handle prefixes like "diff --cc" when computing %(file_old), because we can't tell yet if such a line is "old" or "new". Git only uses these combined headers for binary files, and other edge cases, see: PAGER='less +1206' git show 75ae10b:combine-diff.c Anyway, this is not really important because %(file) already has the correct name. An alternative (partial) solution would be to change %(file) to the old filename but only for deleted files. I decided against this; while it would be convenient for some basic scenarios, it hides information which makes scripting more difficult. Another, more general solution for these kinds of problems would be to allow to pipe the raw diff to user scripts.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This improves interaction with external tools that require file names.
Implemented by extending diff_get_pathname.
We don't handle prefixes like "diff --cc" when computing %(file_old),
because we can't tell yet if such a line is "old" or "new".
Git only uses these combined headers for binary files, and other edge
cases, see: PAGER='less +1206' git show 75ae10b:combine-diff.c
Anyway, this is not really important because %(file) already has the
correct name.
An alternative (partial) solution would be to change %(file) to the
old filename but only for deleted files. I decided against this;
while it would be convenient for some basic scenarios, it hides
information which makes scripting more difficult.
Another, more general solution for these kinds of problems would be
to allow to pipe the raw diff to user scripts.