Fix test bug with spaces in file owner #280
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
Using 'ls -l' and parsing the columns to find file sizes is problematic when the platform could report the owner as a name with spaces. Instead, use the 'test-tool path-utils file-size' command to list only the sizes. Reported-by: Johannes Sixt <[email protected]> Helped-by: Johannes Schindelin <[email protected]> Signed-off-by: Derrick Stolee <[email protected]>
|
/submit |
|
Submitted as [email protected] |
|
This branch is now known as |
|
This patch series was integrated into pu via git@e125aaa. |
|
This patch series was integrated into next via git@c2a907f. |
![gitgitgadget[bot]](https://avatars.githubusercontent.com/in/12836?s=60&v=4){kind=small}
| @@ -443,7 +443,7 @@ test_expect_success 'repack with minimum size does not alter existing packs' ' | |||
| touch -m -t 201901010002 .git/objects/pack/pack-B* && | |||
There was a problem hiding this comment.
On the Git mailing list, Johannes Schindelin wrote (reply to this):
Hi Stolee,
On Mon, 1 Jul 2019, Derrick Stolee via GitGitGadget wrote:
> From: Derrick Stolee <[email protected]>
>
> Using 'ls -l' and parsing the columns to find file sizes is
> problematic when the platform could report the owner as a name
> with spaces. Instead, use the 'test-tool path-utils file-size'
> command to list only the sizes.
Thank you!
> diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
> index 79bfaeafa9..c72ca04399 100755
> --- a/t/t5319-multi-pack-index.sh
> +++ b/t/t5319-multi-pack-index.sh
> @@ -443,7 +443,7 @@ test_expect_success 'repack with minimum size does n=
ot alter existing packs' '
> touch -m -t 201901010002 .git/objects/pack/pack-B* &&
> touch -m -t 201901010003 .git/objects/pack/pack-A* &&
> ls .git/objects/pack >expect &&
> - MINSIZE=3D$(ls -l .git/objects/pack/*pack | awk "{print \$5;}" | sort=
-n | head -n 1) &&
> + MINSIZE=3D$(test-tool path-utils file-size .git/objects/pack/*pack | =
sort -n | head -n 1) &&
You know, we could also add a `--show-minimum` option...
> @@ -455,7 +455,7 @@ test_expect_success 'repack creates a new pack' '
> cd dup &&
> ls .git/objects/pack/*idx >idx-list &&
> test_line_count =3D 5 idx-list &&
> - THIRD_SMALLEST_SIZE=3D$(ls -l .git/objects/pack/*pack | awk "{print \=
$5;}" | sort -n | head -n 3 | tail -n 1) &&
> + THIRD_SMALLEST_SIZE=3D$(test-tool path-utils file-size .git/objects/p=
ack/*pack | sort -n | head -n 3 | tail -n 1) &&
I guess the `--show-minimum` option is no longer such a smart idea ;-)
Patch looks good, thanks for working on this,
Dscho
> BATCH_SIZE=3D$(($THIRD_SMALLEST_SIZE + 1)) &&
> git multi-pack-index repack --batch-size=3D$BATCH_SIZE &&
> ls .git/objects/pack/*idx >idx-list &&
> --
> gitgitgadget
>
There was a problem hiding this comment.
On the Git mailing list, Junio C Hamano wrote (reply to this):
Johannes Schindelin <[email protected]> writes:
> Hi Stolee,
>
> On Mon, 1 Jul 2019, Derrick Stolee via GitGitGadget wrote:
>
>> From: Derrick Stolee <[email protected]>
>>
>> Using 'ls -l' and parsing the columns to find file sizes is
>> problematic when the platform could report the owner as a name
>> with spaces. Instead, use the 'test-tool path-utils file-size'
>> command to list only the sizes.
>
> Thank you!
Yup. Sounds good.
|
This patch series was integrated into pu via git@414f9f7. |
|
This patch series was integrated into pu via git@5bc2835. |
|
This patch series was integrated into pu via git@76785e6. |
|
This patch series was integrated into pu via git@521e0a0. |
|
This patch series was integrated into pu via git@cbaf64d. |
|
This patch series was integrated into pu via git@7d55f29. |
|
This patch series was integrated into pu via git@4308d81. |
|
This patch series was integrated into next via git@4308d81. |
|
This patch series was integrated into master via git@4308d81. |
|
Closed via 4308d81. |
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.
Thanks to Johannes Sixt for reporting this bug and Dscho for presenting the correct test-tool to use.
This applies on ds/midx-expire-repack. If we instead want to squash this into that branch, the two hunks will need to be squashed into these commits:
THIRD_SMALLEST_SIZE applies to ce1e4a1 (midx: implement midx_repack(), 2019-06-10).
MINSIZE applies to 2af890b (multi-pack-index: prepare 'repack' subcommand, 2019-06-10).
Thanks,
-Stolee
Cc: [email protected], [email protected], [email protected], [email protected], [email protected]