Skip to content

Commit

Permalink
demos: redact one of the conflict outputs
Browse files Browse the repository at this point in the history
I would prefer to shorten it instead of fully redacting, but I ran into
#4239
  • Loading branch information
ilyagr committed Sep 5, 2024
1 parent adf2b01 commit a2d45ea
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 76 deletions.
2 changes: 1 addition & 1 deletion demos/demo_juggle_conflicts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ run_command "jj diff -r second"
run_command "jj diff -r third"

comment "Let's reorder the second and third commits:"
run_command "jj rebase -s third -d first"
run_command_output_redacted "jj rebase -s third -d first"
run_command "jj rebase -s second -d third"
run_command "jj log"
comment "The commit labeled \"third\" has a conflict, as expected. What's more
Expand Down
2 changes: 1 addition & 1 deletion demos/helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ run_command_output_redacted() {
echo "\$ $@"
# `bash` often resets $COLUMNS, so we also
# allow $RUN_COMMAND_COLUMNS
eval "$@" > /dev/null
eval "$@" > /dev/null 2>&1
echo -e "\033[0;90m... (output redacted) ...\033[0m"
}

Expand Down
Loading

0 comments on commit a2d45ea

Please sign in to comment.