search

spacedentist / spr

Submit pull requests for individual, amendable, rebaseable commits to GitHub
https://getcord.github.io/spr/
MIT License
377 stars 33 forks source link

Every time I update I get title/message differences #129

Open alper opened 1 year ago

alper commented 1 year ago

"The Pull Request's title/message differ from the local commit's message."

I'm not sure why I'm getting this and the interface how to resolve this is also not very clear. I'm passing the --update-message flag but that still asks me to provide a message (why?).

alper commented 1 year ago

OK. Reading the source code, I figured it out.

I had to pass a command like: spr diff --message Rebase --update-message --all

If you pass --update-message, you also need to pass a --message which will then show up in the PR as an intermediate 'change' to show what you did.

Could we document this? Also if after a rebase I want to just update my PRs, could it be possible to do this doing just spreading diff --all?

sven-of-cord commented 1 year ago

You should only get prompted for a message if there are actual changes in your local commit. (That could also be that you rebased your commit in the meantime.)

If the commit contents didn't change at all and you didn't rebase, then spr diff --update-message shouldn't prompt for a message.

I am aware of a problem that even after using --update-message, the next run of spr diff will show the "messages differ" warning again. I think it's just a whitespace difference (maybe GitHub adds or removes a newline at the end or something). I'll have to fix that...

maverick1872 commented 9 months ago

Any update w/ this? Currently been trying SPR out this week and this has been one of my two major pain points. Seems that even if I run the following I'll still get a title/message diff warning.

$ spr diff --all (gives warning for all current outstanding diffs)
$ spr amend --all (force local to match what GitHub has)
$ spr diff --all (gives warning still for all current outstanding diffs)