Fix Windows build of next
#87
Closed
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
Add new formatting option objectsize:disk to know exact size that object takes up on disk. Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
Test new formatting atom. Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
Add new formatting option: deltabase. If the object is stored as a delta on-disk, this expands to the 40-hex sha1 of the delta base object. Otherwise, expands to the null sha1 (40 zeroes). We have same option in cat-file command. Hopefully, in the end I will remove formatting code from cat-file and reuse formatting parts from ref-filter. Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
Test new formatting option deltabase. Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
Add documentation for formatting options objectsize:disk and deltabase. Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
The `%lld` format is supported on Linux and macOS, but not on Windows. This issue has been reported ten days ago (Message-ID: nycvar.QRO.7.76.6.1811121300520.39@tvgsbejvaqbjf.bet), but the corresponding topic still advanced to `next` in the meantime, breaking the Windows build. Let's use `PRIdMAX` and a cast to `intmax_t` instead, which unbreaks the build, and imitates how we do things e.g. in `json-writer.c` already. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
/submit |
|
Submitted as pull.87.git.gitgitgadget@gmail.com |
|
This branch is now known as |
|
This patch series was integrated into pu via git@df0a1bf. |
|
This patch series was integrated into next via git@f850576. |
dscho
force-pushed
the
ot/ref-filter-object-info
branch
from
7225a2b to
59012fe
Compare
|
A slightly modified version of this patch was folded into an updated iteration of |
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.
The topic
ot/ref-filter-object-infobroke the Windows build since it enteredpu, and as a consequence we have no test coverage of the other topics inpu.Sadly, this topic now advanced to
next. Junio, I would like to ask you to merge this fix down tonextand to advance tomastertogether withot/ref-filter-object-info.