Restore astextplain passthrough #628
Merged
Conversation
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
The fix for git-for-windows/git#5641 broke diffs for plaintext DOC and DOT files: $ echo Test > test.doc $ git add test.doc $ git diff --cached E: unsupported filetype test.doc Since `file` correctly identifies the mimetype of such files as `text/plain`, this can be fixed by simply covering this case and printing the file content as it was done previously. Signed-off-by: Claudio Hoffmann <c.hoffmann@dev-threads.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
restore-astextplain-passthrough
branch
from
b05f0c0 to
b8f89bf
Compare
In 48e2403 (git-extra: ignore generated changes for the sake of `pkgver`, 2025-03-05) I tried to address the fact that the commit that updates `pkgver` in `PKGBUILD` necessarily touches the `git-extra/` subdirectory, yet should not be considered for the package version. What I failed to address is the rare case when `HEAD` is not the same as `$rev`, i.e. when the last commit that touched the `git-extra/` directory` is not at the tip of the branch. Let's accommodate for that, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
restore-astextplain-passthrough
branch
from
b8f89bf to
ea851d9
Compare
|
/deploy git-extra The i686/x86_64 and the arm64 workflow runs were started. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 PR is identical to #626 except it also merges the current
mainand then updates the checksums andpkgveras required. I would have don that in #626 but the write permission for maintainers on the PR branch was explicitly disabled, so I couldn't.