search

packit / dist-git-to-source-git

Converting dist-git to source-git
MIT License
4 stars 9 forks source link

error: '3.0-sgml' does not have a commit checked out #217

Open sentry-io[bot] opened 3 years ago

sentry-io[bot] commented 3 years ago

Sentry Issue: DIST2SRC-UPDATE-78

GitCommandError: Cmd('git') failed due to: exit code(1)
  cmdline: git cherry-pick --keep-redundant-commits --strategy=recursive --strategy-option=theirs updates~5
  stdout: 'CONFLICT (add/add): Merge conflict in 4.2-sgml
Auto-merging 4.2-sgml
CONFLICT (add/add): Merge conflict in 4.1-sgml
Auto-merging 4.1-sgml
CONFLICT (add/add): Merge conflict in 4.0-sgml
Auto-merging 4.0-sgml
CONFLICT (add/add): Merge conflict in 3.1-sgml
Auto-merging 3.1-sgml
CONFLICT (add/add): Merge conflict in 3.0-sgml
Auto-merging 3.0-sgml'
  std...
  File "dist2src/core.py", line 186, in cherry_pick_base
    self.repo.git.cherry_pick(f"{from_branch}~{num_commits - 1}", **git_options)
  File "git/cmd.py", line 542, in <lambda>
    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
  File "git/cmd.py", line 1005, in _call_process
    return self.execute(call, **exec_kwargs)
  File "git/cmd.py", line 822, in execute
    raise GitCommandError(command, status, stderr_value, stdout_value)

GitCommandError: Cmd('git') failed due to: exit code(128)
  cmdline: git add . -f
  stderr: 'error: '3.0-sgml' does not have a commit checked out
fatal: updating files failed'
(6 additional frame(s) were not displayed)
...
  File "dist2src/core.py", line 195, in cherry_pick_base
    self.stage(".")
  File "dist2src/core.py", line 152, in stage
    self.repo.git.add(add or ".", "-f", exclude)
  File "git/cmd.py", line 542, in <lambda>
    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
  File "git/cmd.py", line 1005, in _call_process
    return self.execute(call, **exec_kwargs)
  File "git/cmd.py", line 822, in execute
    raise GitCommandError(command, status, stderr_value, stdout_value)