From 47f09e6ff4b91d706a222eb9a7cc562bc4dbdaeb Mon Sep 17 00:00:00 2001 From: cloudhead Date: Thu, 31 Aug 2023 10:44:36 +0200 Subject: [PATCH] cli: Don't test Git hints in test These hints are not stable and change with different Git versions. We ignore them in the test output. --- radicle-cli/examples/git/git-push.md | 6 +++--- radicle-cli/examples/rad-patch-via-push.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/radicle-cli/examples/git/git-push.md b/radicle-cli/examples/git/git-push.md index e27bd2ab..fd8572e0 100644 --- a/radicle-cli/examples/git/git-push.md +++ b/radicle-cli/examples/git/git-push.md @@ -20,9 +20,9 @@ $ git push rad HEAD:alice/1 To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi ! [rejected] HEAD -> alice/1 (non-fast-forward) error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi' -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. Integrate the remote changes (e.g. -hint: 'git pull ...') before pushing again. +hint: [..] +hint: [..] +hint: [..] hint: See the 'Note about fast-forwards' in 'git push --help' for details. ``` diff --git a/radicle-cli/examples/rad-patch-via-push.md b/radicle-cli/examples/rad-patch-via-push.md index 568dbc47..71343a3f 100644 --- a/radicle-cli/examples/rad-patch-via-push.md +++ b/radicle-cli/examples/rad-patch-via-push.md @@ -185,9 +185,9 @@ $ git push To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi ! [rejected] feature/2 -> patches/fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b (non-fast-forward) error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi' -hint: Updates were rejected because a pushed branch tip is behind its remote -hint: counterpart. Check out this branch and integrate the remote changes -hint: (e.g. 'git pull ...') before pushing again. +hint: [..] +hint: [..] +hint: [..] hint: See the 'Note about fast-forwards' in 'git push --help' for details. ```