{"action":"created","issue":{"url":"https://api.github.com/repos/sakura-editor/sakura/issues/68","repository_url":"https://api.github.com/repos/sakura-editor/sakura","labels_url":"https://api.github.com/repos/sakura-editor/sakura/issues/68/labels{/name}","comments_url":"https://api.github.com/repos/sakura-editor/sakura/issues/68/comments","events_url":"https://api.github.com/repos/sakura-editor/sakura/issues/68/events","html_url":"https://github.com/sakura-editor/sakura/pull/68","id":329877355,"node_id":"MDExOlB1bGxSZXF1ZXN0MTkzMDIwODk3","number":68,"title":"[WIP] installerリポジトリ再取り込み（履歴表示用）","user":{"login":"kobake","id":2929454,"node_id":"MDQ6VXNlcjI5Mjk0NTQ=","avatar_url":"https://avatars1.githubusercontent.com/u/2929454?v=4","gravatar_id":"","url":"https://api.github.com/users/kobake","html_url":"https://github.com/kobake","followers_url":"https://api.github.com/users/kobake/followers","following_url":"https://api.github.com/users/kobake/following{/other_user}","gists_url":"https://api.github.com/users/kobake/gists{/gist_id}","starred_url":"https://api.github.com/users/kobake/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kobake/subscriptions","organizations_url":"https://api.github.com/users/kobake/orgs","repos_url":"https://api.github.com/users/kobake/repos","events_url":"https://api.github.com/users/kobake/events{/privacy}","received_events_url":"https://api.github.com/users/kobake/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2018-06-06T13:52:28Z","updated_at":"2018-06-09T02:27:25Z","closed_at":null,"author_association":"MEMBER","pull_request":{"url":"https://api.github.com/repos/sakura-editor/sakura/pulls/68","html_url":"https://github.com/sakura-editor/sakura/pull/68","diff_url":"https://github.com/sakura-editor/sakura/pull/68.diff","patch_url":"https://github.com/sakura-editor/sakura/pull/68.patch"},"body":"検証中。\r\n\r\n## 変更内容\r\n#60, #62 で取り込んだ installer リポジトリのログ内容がうまく参照できていない\r\nhttps://github.com/sakura-editor/sakura/commits/master/installer\r\nので、merge ではなく subtree コマンドにより取り込み直す。\r\n\r\n## 参考 subtree 手順\r\n- ヘルプ系リポジトリの取り込み #63\r\n\r\n上記 PR では subtree による取り込みを行っており、履歴も正常に取り込めている。\r\nhttps://github.com/sakura-editor/sakura/commits/master/help\r\n\r\n## 手順\r\n```\r\ngit fetch github\r\ngit checkout -b reimport-installer-with-log github/master\r\n\r\ngit revert 8bd3214e02277ade57917569b6d82f11714db9a8\r\ngit revert -m 1 42e7bcfa81abd9e86f4ba5f5a72603f5cc39b76b\r\n\r\ngit remote add github-installer git@github.com:sakura-editor/installer.git\r\ngit subtree add --prefix=installer/ github-installer master\r\n\r\ngit push github reimport-installer-with-log\r\n```\r\n\r\n## 取り込んだ installer のログ確認\r\n- https://github.com/sakura-editor/sakura/commits/reimport-installer-with-log/installer\r\n"},"comment":{"url":"https://api.github.com/repos/sakura-editor/sakura/issues/comments/395933145","html_url":"https://github.com/sakura-editor/sakura/pull/68#issuecomment-395933145","issue_url":"https://api.github.com/repos/sakura-editor/sakura/issues/68","id":395933145,"node_id":"MDEyOklzc3VlQ29tbWVudDM5NTkzMzE0NQ==","user":{"login":"berryzplus","id":3253151,"node_id":"MDQ6VXNlcjMyNTMxNTE=","avatar_url":"https://avatars0.githubusercontent.com/u/3253151?v=4","gravatar_id":"","url":"https://api.github.com/users/berryzplus","html_url":"https://github.com/berryzplus","followers_url":"https://api.github.com/users/berryzplus/followers","following_url":"https://api.github.com/users/berryzplus/following{/other_user}","gists_url":"https://api.github.com/users/berryzplus/gists{/gist_id}","starred_url":"https://api.github.com/users/berryzplus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/berryzplus/subscriptions","organizations_url":"https://api.github.com/users/berryzplus/orgs","repos_url":"https://api.github.com/users/berryzplus/repos","events_url":"https://api.github.com/users/berryzplus/events{/privacy}","received_events_url":"https://api.github.com/users/berryzplus/received_events","type":"User","site_admin":false},"created_at":"2018-06-09T02:27:25Z","updated_at":"2018-06-09T02:27:25Z","author_association":"CONTRIBUTOR","body":"前にローカルで実験したときは、ここの手順通りで取り込めたような。\r\n\r\nhttps://git-scm.com/book/ja/v1/Git-%E3%81%AE%E3%81%95%E3%81%BE%E3%81%96%E3%81%BE%E3%81%AA%E3%83%84%E3%83%BC%E3%83%AB-%E3%82%B5%E3%83%96%E3%83%84%E3%83%AA%E3%83%BC%E3%83%9E%E3%83%BC%E3%82%B8\r\n※サブツリーの歴史を取り込まない方法の説明の中に、チラッと書いてある。\r\n\r\ngitはほぼ分かっていないので確かなことは言えませんが、公式マニュアルでは取り込み対象リポジトリを別ブランチのルートに取り込んでから作業してるような気がします。ここでやろうとしてる取り込はサブツリー化＋階層合わせなのでよりややこしいものだろうとは思ってます。\r\n"}}
{"actor":{"display_login":"berryzplus"}}