Error during cherry picking

[mkaraev]

I ran cherry_picker 27ed64575d34f04029ba1d353810f3db4f4f045b 3.13 from this PR python/cpython#133907 (comment)
and got conflicting files. Fixed conflicts and tried to run cherry_picker --continue and got this strange error:

Traceback (most recent call last):
  File "/Users/user/PycharmProjects/cherry_picker/.venv/bin/cherry_picker", line 8, in <module>
    sys.exit(cherry_pick_cli())
             ~~~~~~~~~~~~~~~^^
  File "/Users/user/PycharmProjects/cherry_picker/.venv/lib/python3.13/site-packages/click/core.py", line 1442, in __call__
    return self.main(*args, **kwargs)
           ~~~~~~~~~^^^^^^^^^^^^^^^^^
  File "/Users/user/PycharmProjects/cherry_picker/.venv/lib/python3.13/site-packages/click/core.py", line 1363, in main
    rv = self.invoke(ctx)
  File "/Users/user/PycharmProjects/cherry_picker/.venv/lib/python3.13/site-packages/click/core.py", line 1226, in invoke
    return ctx.invoke(self.callback, **ctx.params)
           ~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/user/PycharmProjects/cherry_picker/.venv/lib/python3.13/site-packages/click/core.py", line 794, in invoke
    return callback(*args, **kwargs)
  File "/Users/user/PycharmProjects/cherry_picker/.venv/lib/python3.13/site-packages/click/decorators.py", line 34, in new_func
    return f(get_current_context(), *args, **kwargs)
  File "/Users/user/PycharmProjects/cherry_picker/.venv/lib/python3.13/site-packages/cherry_picker/cherry_picker.py", line 855, in cherry_pick_cli
    cherry_picker.continue_cherry_pick()
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/Users/user/PycharmProjects/cherry_picker/.venv/lib/python3.13/site-packages/cherry_picker/cherry_picker.py", line 639, in continue_cherry_pick
    commits = get_commits_from_backport_branch(base)
  File "/Users/user/PycharmProjects/cherry_picker/.venv/lib/python3.13/site-packages/cherry_picker/cherry_picker.py", line 965, in get_commits_from_backport_branch
    output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
  File "/opt/homebrew/Cellar/[email protected]/3.13.3/Frameworks/Python.framework/Versions/3.13/lib/python3.13/subprocess.py", line 472, in check_output
    return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
           ~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
               **kwargs).stdout
               ^^^^^^^^^
  File "/opt/homebrew/Cellar/[email protected]/3.13.3/Frameworks/Python.framework/Versions/3.13/lib/python3.13/subprocess.py", line 577, in run
    raise CalledProcessError(retcode, process.args,
                             output=stdout, stderr=stderr)
subprocess.CalledProcessError: Command '['git', 'log', '--format=%H', '3.13..']' returned non-zero exit status 128.

Further attempts to run cherry_picker --status or cherry_picker --abort failed with error:

Run state cherry-picker.state=CONTINUATION_STARTED in Git config is not known.
Perhaps it has been set by a newer version of cherry-picker. Try upgrading.
Valid states are: BACKPORT_PAUSED, UNSET. If this looks suspicious, raise an issue at https://github.com/python/cherry-picker/issues/new.
As the last resort you can reset the runtime state stored in Git config using the following command: `git config --local --remove-section cherry-picker`

I'm using cherry_picker version 2.5.0

[sobolevn]

Please, run git fetch origin 3.13

Will it solve your issue?

[mkaraev]

Will it solve your issue?

Nope :)
I'm still getting the same error.

[mkaraev]

@sobolevn ohh, I got what you meant. I needed local copy of 3.13. That solved my problem. Thank you!

[skirpichev]

I think it's a duplicate.