Skip to content

Makefile: ensure redact_safe.md generation is stable#50205

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20200615-redact-make
Jun 15, 2020
Merged

Makefile: ensure redact_safe.md generation is stable#50205
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20200615-redact-make

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented Jun 15, 2020

Fixes #50146

On some platforms, the default behavior of git grep is to number
the lines (i.e. -n is implicitly added).

This patch makes the -n explicit and tweaks the sed patterns to
ensure that the behavior is stable.

Release note: None

On some platforms, the default behavior of `git grep` is to number
the lines (i.e. `-n` is implicitly added).

This patch makes the `-n` explicit and tweaks the sed patterns to
ensure that the behavior is stable.

Release note: None
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@knz knz requested a review from irfansharif June 15, 2020 15:33
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jun 15, 2020

@RichardJCai confirms there's no diff on his computer after applying this patch.

@RichardJCai you can also review this :)

Copy link
Copy Markdown
Contributor

@RichardJCai RichardJCai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Jun 15, 2020

thanks

bors r=RichardJCai

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 15, 2020

Build failed (retrying...)

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 15, 2020

Build failed (retrying...)

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 15, 2020

Build succeeded

@craig craig bot merged commit 5cff000 into cockroachdb:master Jun 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Incompatible redact_safe.md generated on mac

3 participants