search

mackyle / topgit

TopGit - A different patch queue manager
https://repo.or.cz/topgit/pro.git
Other
67 stars 7 forks source link

fix for tg-update when out-of-date with respect to remote #5

Closed pmolodo closed 7 years ago

pmolodo commented 7 years ago

was getting errors that looked like this: tg: Updating tg/branch base with deps: :refs/remotes/tgremote/top-bases/tg/branch tg/dep_branch fatal: Not a valid object name refs/heads/:refs/remotes/tgremote/top-bases/tg/branch

Signed-off-by: Paul Molodowitch pm@stanfordalumni.org

pmolodo commented 7 years ago

Also - thanks for addressing my previous merge-requests! Much appreciated!

Also-also... noticed you don't have an "issues" tab. Is this intentional?

mackyle commented 7 years ago

Thank you for reporting this problem. The test suite still does not have full coverage (but at least there is one now).

Thank you for the Signed-off-by line.

Unfortunately the fix you provided is incorrect.

For starters it's an invalid sed command. Try this:

echo hi | sed 's/:[^ ]* (.*)$/\1/'

and you will see the problem. While that does actually allow tg update to succeed, it does so by preventing it from seeing any updates at all.

In addition, it introduces a new test breakage in t2100.

I have posted a new topgit-0.19.9 release with the correct fix and a bunch of new tg update tests in the test suite. I have also enabled "issues" for this repository.

Thank you again for your help.