Otherwise, problems arise when branches depend (via .topdeps) on SHA1s:
$ tg push -r tmp t/____longjmp_chk_cleanup_linux_x86_64
fatal: 77c84aeb81808c3109665949448dba59965c391e cannot be resolved to branch.
fatal: The remote end hung up unexpectedly
Signed-off-by: Thomas Schwinge <thomas@xxxxxxxxxxxxx>
---
Hello!
I was facing the following problem:
thomas@dirichlet:~/tmp/source/glibc/git/glibc.hurd $ bash -v -x /usr/bin/tg push -r tmp t/____longjmp_chk_cleanup_linux_x86_64
[...]
++ read _dep
++ missing_deps=
++ rm /tmp/tg-depsfile.nCfywI
++ return 0
++ xargs git push tmp
++ sort -u /tmp/tg-push-listfile.sZeHIr
fatal: 77c84aeb81808c3109665949448dba59965c391e cannot be resolved to branch.
fatal: The remote end hung up unexpectedly
rm -f "/tmp/tg-push-listfile.sZeHIr"
+ rm -f /tmp/tg-push-listfile.sZeHIr
That's the actual problem:
thomas@dirichlet:~/tmp/source/glibc/git/glibc.hurd $ git push tmp 77c84aeb81808c3109665949448dba59965c391e
fatal: 77c84aeb81808c3109665949448dba59965c391e cannot be resolved to branch.
fatal: The remote end hung up unexpectedly
... which is due to:
$ git show t/____longjmp_chk_cleanup_linux_x86_64:.topdeps
77c84aeb81808c3109665949448dba59965c391e
All other parts (at least those I tested / got to use so far) work just
fine when passing SHA1s.
Here is a patch to make this work for tg push, too.
thomas@dirichlet:~/tmp/source/glibc/git/glibc.hurd $ tg push -r tmp t/____longjmp_chk_cleanup_linux_x86_64
Counting objects: 196207, done.
Compressing objects: 100% (32953/32953), done.
Writing objects: 100% (196207/196207), 66.45 MiB | 4047 KiB/s, done.
Total 196207 (delta 163379), reused 191592 (delta 159243)
To /media/Stalin/tmp/glibc
* [new branch] t/____longjmp_chk_cleanup_linux_x86_64 -> t/____longjmp_chk_cleanup_linux_x86_64
* [new branch] refs/top-bases/t/____longjmp_chk_cleanup_linux_x86_64 -> refs/top-bases/t/____longjmp_chk_cleanup_linux_x86_64
tg-push.sh | 3 +++
tg.sh | 7 +++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/tg-push.sh b/tg-push.sh
index cd208a0..089f885 100644
--- a/tg-push.sh
+++ b/tg-push.sh
@@ -53,6 +53,9 @@ push_branch()
# if so desired omit non tgish deps
$tgish_deps_only && [ -z "$_dep_is_tgish" ] && return 0
+ # filter out plain SHA1s
+ is_sha1 "$_dep" && return 0
+
echo "$_dep" >> "$_listfile"
[ -z "$_dep_is_tgish" ] ||
echo "top-bases/$_dep" >> "$_listfile"
diff --git a/tg.sh b/tg.sh
index 1f6d3da..91c374a 100644
--- a/tg.sh
+++ b/tg.sh
@@ -126,6 +126,13 @@ branch_annihilated()
test "$(git rev-parse "$mb^{tree}")" = "$(git rev-parse "$_name^{tree}")";
}
+# is_sha1 REF
+# Whether REF is a SHA1 (compared to a symbolic name).
+is_sha1()
+{
+ [ "$(git rev-parse "$1")" = "$1" ]
+}
+
# recurse_deps CMD NAME [BRANCHPATH...]
# Recursively eval CMD on all dependencies of NAME.
# CMD can refer to $_name for queried branch name,
--
tg: (341a371..) t/tg_push_no_SHA1 (depends on: master)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html