New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
t5050-update-orphans failures with Git 2.30.1 #18
Comments
Hello, I think I hit this bug this week with Git 2.30 as well.
I had to quickly fix it and then I was unable to reproduce it after. I was looking after a way to reproduce it and I'm glad you open this new bug report :-) I don't know if the following would be useful to someone here but here is I wrote when I had the issue:
BTW: thanks for maintaining and developing this really useful tool :-) |
Made a |
Any idea how to fix this? |
Hello,
Because other people contacted me to know exactly what I did, here is the patch I applied as a workaround for Git >=v2.30 diff --git a/tg-update.sh b/tg-update.sh
index 1776d52..cf22f3f 100644
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -566,7 +566,7 @@ git_topmerge()
fi
done
(cd "$repotoplvl" && git checkout-index -q -f -u -- .topdeps .topmsg) ||
- die "git checkout-index failed"
+ echo "WARN: git checkout-index failed"
fi
# dump output without any .topdeps or .topmsg messages
sed -e '/ \.topdeps/d' -e '/ \.topmsg/d' <"$tmpstdout" then re-launch Or if you have installed TopGit from a package, do the same modification in the file in With this, I have the warning but it doesn't seem to be an issue because |
I've finally been able to get back to this project. That patch is fine, but this one is simpler:
The help for
But since Git v2.30.0 it's no longer "quiet" -- I consider throwing an error code not being quiet -- even if the It will also include a proper fix for issue #17 which first appeared in Git v2.29.0 and a fix for the change in how |
Thank you for looking at that, providing a better workaround and explaining the issue! |
The topgit-0.19.13 release contains a resolution for this (and other reported issues). |
Thank you! |
t5050-update-orphans.sh
fails with Git 2.30.1, see the attached t5050-update-orphans.log.The text was updated successfully, but these errors were encountered: