Hi there,
I'm posting here instead of opening a ticket right away because I'm not
sure whether the error I'm getting is my fault or not. The scenario is the
following: I import a patch that does not apply cleanly and take care of
the .rej files by hand. After I'm done with that, I tell the dev script
that everything is 'resolved'. At that point it crashes:
...
Removing tmp/
GitError: git exited with a non-zero exit code (1).
This happened while executing "git am --resolved --resolvemsg= ".
git printed nothing to STDOUT.
git printed the following to STDERR:
git: 'am' is not a git command. See 'git --help'.
Did you mean one of these?
br
ci
co
lg
st
stat
So it's the command dev.git.am(), that's called at this point in
./src/sage/dev/patch.py:
self.git.am('--resolvemsg= ', resolved=True)
self._UI.debug("A commit on the current branch has been created from the
patch.")
Is my git missing something or is there a bug here?
Best,
Jan
--
You received this message because you are subscribed to the Google Groups
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.
