{"thread":{"id":"26763","subject":"[PATCH TopGit] tg-export.sh: support tag objects as parent","startedAt":"2011-03-17T18:30:23Z","lastAt":"2011-03-17T18:30:23Z","messageCount":1,"participants":["Andrey Borzenkov"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"163571","messageId":"1300386623-31666-1-git-send-email-arvidjaar@gmail.com","threadId":"26763","inReplyTo":null,"subject":"[PATCH TopGit] tg-export.sh: support tag objects as parent","fromName":"Andrey Borzenkov","fromEmail":"arvidjaar@gmail.com","sentAt":"2011-03-17T18:30:23Z","receivedAt":"2011-03-17T18:30:23Z","isPatch":true,"sender":{"key":"arvidjaar@gmail.com","avatar":null},"body":"Currently tg-export fails with\n\nCollapsing u/quota-pull\nfatal: 2770ca86dec8b9cc36bf50127e5aff7f29557e3c is not a valid 'commit' object\n\nCheck for and resolve tag objects for parent.\n\nSigned-off-by: Andrey Borzenkov <arvidjaar@gmail.com>\n\n---\n tg-export.sh |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/tg-export.sh b/tg-export.sh\nindex 486ec94..4574882 100644\n--- a/tg-export.sh\n+++ b/tg-export.sh\n@@ -95,7 +95,8 @@ collapsed_commit()\n \t>\"$playground/^body\"\n \n \t# Determine parent\n-\tparent=\"$(cut -f 1 \"$playground/$name^parents\")\"\n+\tparent=\"$(cut -f 1 \"$playground/$name^parents\" | \\\n+\t\twhile read p; do [ $(git cat-file -t $p 2> /dev/null) = tag ] && git cat-file tag $p | head -1 | cut -d' ' -f2 || echo $p; done)\"\n \tif [ \"$(cat \"$playground/$name^parents\" | wc -l)\" -gt 1 ]; then\n \t\t# Produce a merge commit first\n \t\tparent=\"$({\n-- \ntg: (9aa66bc..) u/parent-tag (depends on: u/signed-off-by)\n"}]}