Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rebase: Remove requirement for --experimental with local rebases #2110

Merged
merged 1 commit into from
May 29, 2020
Merged

rebase: Remove requirement for --experimental with local rebases #2110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/app/rpmostree-builtin-rebase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@ rpmostree_builtin_rebase (int argc,
{
if (*remainder == '/')
{
if (!opt_experimental)
return glnx_throw (error, "Local repo rebase requires --experimental");
const char *ref = strrchr (remainder, ':');
if (!ref)
return glnx_throw (error, "Missing ':' in LOCALPATH:REF rebase");
Expand Down
2 changes: 1 addition & 1 deletion tests/vmcheck/test-misc-2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ vm_rpmostree cleanup -p
echo "ok rebase with custom origin"

# Try again but making it think it's pulling from another local repo
vm_rpmostree rebase --skip-purge /sysroot/ostree/repo:${booted_csum} --experimental
vm_rpmostree rebase --skip-purge /sysroot/ostree/repo:${booted_csum}
vm_rpmostree upgrade >out.txt
assert_file_has_content_literal out.txt 'Pinned to commit; no upgrade available'
vm_rpmostree cleanup -p
Expand Down