{"thread":{"id":"46065","subject":"[PATCH] pull: ff --rebase --autostash works in dirty repo","startedAt":"2017-05-28T23:31:15Z","lastAt":"2017-06-01T09:42:04Z","messageCount":6,"participants":["Tyler Brazier","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"320910","messageId":"0102015c5166284d-d8dd6534-a8d5-452d-af14-d827934ef593-000000@eu-west-1.amazonses.com","threadId":"46065","inReplyTo":null,"subject":"[PATCH] pull: ff --rebase --autostash works in dirty repo","fromName":"Tyler Brazier","fromEmail":"tyler@tylerbrazier.com","sentAt":"2017-05-28T23:31:08Z","receivedAt":"2017-05-28T23:31:15Z","isPatch":true,"sender":{"key":"tyler@tylerbrazier.com","avatar":"https://avatars.githubusercontent.com/u/4481528?v=4"},"body":"pull --rebase --autostash was failing on a fast-forward in a dirty repo\nsince we shortcut to run_merge(), which does not know how to autostash.\nThe shortcut is a performance optimization, and since rebase was\nrewritten in C, it seemed okay to just bypass the shortcut if we\nautostash.\n---\n builtin/pull.c  |  5 +++--\n t/t5520-pull.sh | 18 ++++++++++++++++++\n 2 files changed, 21 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/pull.c b/builtin/pull.c\nindex dd1a4a94e41e..609e594d3f28 100644\n--- a/builtin/pull.c\n+++ b/builtin/pull.c\n@@ -772,6 +772,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n \tstruct oid_array merge_heads = OID_ARRAY_INIT;\n \tstruct object_id orig_head, curr_head;\n \tstruct object_id rebase_fork_point;\n+\tint autostash;\n \n \tif (!getenv(\"GIT_REFLOG_ACTION\"))\n \t\tset_reflog_message(argc, argv);\n@@ -800,8 +801,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n \tif (!opt_rebase && opt_autostash != -1)\n \t\tdie(_(\"--[no-]autostash option is only valid with --rebase.\"));\n \n+\tautostash = config_autostash;\n \tif (opt_rebase) {\n-\t\tint autostash = config_autostash;\n \t\tif (opt_autostash != -1)\n \t\t\tautostash = opt_autostash;\n \n@@ -868,7 +869,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n \t\thead = lookup_commit_reference(orig_head.hash);\n \t\tcommit_list_insert(head, &list);\n \t\tmerge_head = lookup_commit_reference(merge_heads.oid[0].hash);\n-\t\tif (is_descendant_of(merge_head, list)) {\n+\t\tif (!autostash && is_descendant_of(merge_head, list)) {\n \t\t\t/* we can fast-forward this without invoking rebase */\n \t\t\topt_ff = \"--ff-only\";\n \t\t\treturn run_merge();\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex 17f4d0fe4e72..4c85be0417cf 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -272,6 +272,24 @@ test_expect_success '--rebase fast forward' '\n \ttest_cmp reflog.expected reflog.fuzzy\n '\n \n+test_expect_success '--rebase --autostash fast forward' '\n+\ttest_when_finished \"\n+\t\tgit reset --hard;\n+\t\tgit checkout to-rebase;\n+\t\tgit branch -D to-rebase-ff;\n+\t\tgit branch -D behind\" &&\n+\tgit branch behind &&\n+\tgit checkout -b to-rebase-ff &&\n+\techo another modification >>file &&\n+\tgit add file &&\n+\tgit commit -m mod &&\n+\n+\tgit checkout behind &&\n+\techo dirty >file &&\n+\tgit pull --rebase --autostash . to-rebase-ff &&\n+\ttest \"$(git rev-parse HEAD)\" = \"$(git rev-parse to-rebase-ff)\"\n+'\n+\n test_expect_success '--rebase with conflicts shows advice' '\n \ttest_when_finished \"git rebase --abort; git checkout -f to-rebase\" &&\n \tgit checkout -b seq &&\n\n--\nhttps://github.com/git/git/pull/365\n"},{"id":"320919","messageId":"xmqqmv9w8kbg.fsf@gitster.mtv.corp.google.com","threadId":"46065","inReplyTo":"0102015c5166284d-d8dd6534-a8d5-452d-af14-d827934ef593-000000@eu-west-1.amazonses.com","subject":"Re: [PATCH] pull: ff --rebase --autostash works in dirty repo","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-05-29T02:32:03Z","receivedAt":"2017-05-29T02:32:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Tyler Brazier <tyler@tylerbrazier.com> writes:\n\n> pull --rebase --autostash was failing on a fast-forward in a dirty repo\n> since we shortcut to run_merge(), which does not know how to autostash.\n> The shortcut is a performance optimization, and since rebase was\n> rewritten in C, it seemed okay to just bypass the shortcut if we\n> autostash.\n> ---\n\nPlease clarify \"was failing\".  I suspect that\n\n    When we can fast-forward to the updated upstream, \"git pull\n    --rebase --autostash\" in a dirty repository did not auto-stash\n    and failed.  This was due to a short-cut to avoid running rebase\n    when we can fast-forward, but the autostash option was ignored\n    in that codepath.\n\nor something like that was what you meant.\n\n\"rebase\" was not rewritten in C.  Not the part that matters in\nmaking \"pull --rebase\" work anyway.  Unlike the one in the earlier\ndiscussion, you are not removing the short-cut unconditionally; I do\nnot think you need to justify the \"bypassing\" based on performance.\nIf we need to take run_rebase() codepath when \"--autostash\" is in\neffect, we need to do so even if the result were somewhat slower for\ncorrectness (and it would not hurt to mention that actual measurement\nshowed that it is dubious it is slower in the first place).\n\nMissing sign-off.\n\n>  builtin/pull.c  |  5 +++--\n>  t/t5520-pull.sh | 18 ++++++++++++++++++\n>  2 files changed, 21 insertions(+), 2 deletions(-)\n>\n> diff --git a/builtin/pull.c b/builtin/pull.c\n> index dd1a4a94e41e..609e594d3f28 100644\n> --- a/builtin/pull.c\n> +++ b/builtin/pull.c\n> @@ -772,6 +772,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n>  \tstruct oid_array merge_heads = OID_ARRAY_INIT;\n>  \tstruct object_id orig_head, curr_head;\n>  \tstruct object_id rebase_fork_point;\n> +\tint autostash;\n>  \n>  \tif (!getenv(\"GIT_REFLOG_ACTION\"))\n>  \t\tset_reflog_message(argc, argv);\n> @@ -800,8 +801,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n>  \tif (!opt_rebase && opt_autostash != -1)\n>  \t\tdie(_(\"--[no-]autostash option is only valid with --rebase.\"));\n>  \n> +\tautostash = config_autostash;\n>  \tif (opt_rebase) {\n> -\t\tint autostash = config_autostash;\n>  \t\tif (opt_autostash != -1)\n>  \t\t\tautostash = opt_autostash;\n>  \n> @@ -868,7 +869,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n>  \t\thead = lookup_commit_reference(orig_head.hash);\n>  \t\tcommit_list_insert(head, &list);\n>  \t\tmerge_head = lookup_commit_reference(merge_heads.oid[0].hash);\n> -\t\tif (is_descendant_of(merge_head, list)) {\n> +\t\tif (!autostash && is_descendant_of(merge_head, list)) {\n>  \t\t\t/* we can fast-forward this without invoking rebase */\n>  \t\t\topt_ff = \"--ff-only\";\n>  \t\t\treturn run_merge();\n\nThe scope of the \"autostash\" feels a bit unfortunate, but that is a\ndirect consequence of having two \"if (opt_rebase)\" separated in the\ncontrol flow, so it's not your fault.\n\nWhen autostsash is in effect, you _know_ you do not have to compute\nis-descendant-of and you do not have to prepare merge_head or list\nhere.  I do not like deeply indented code, but perhaps like this one\non top of your patch?\n\n builtin/pull.c | 22 ++++++++++++----------\n 1 file changed, 12 insertions(+), 10 deletions(-)\n\ndiff --git a/builtin/pull.c b/builtin/pull.c\nindex 609e594d3f..42f0560252 100644\n--- a/builtin/pull.c\n+++ b/builtin/pull.c\n@@ -863,16 +863,18 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n \t\tdie(_(\"Cannot rebase onto multiple branches.\"));\n \n \tif (opt_rebase) {\n-\t\tstruct commit_list *list = NULL;\n-\t\tstruct commit *merge_head, *head;\n-\n-\t\thead = lookup_commit_reference(orig_head.hash);\n-\t\tcommit_list_insert(head, &list);\n-\t\tmerge_head = lookup_commit_reference(merge_heads.oid[0].hash);\n-\t\tif (!autostash && is_descendant_of(merge_head, list)) {\n-\t\t\t/* we can fast-forward this without invoking rebase */\n-\t\t\topt_ff = \"--ff-only\";\n-\t\t\treturn run_merge();\n+\t\tif (!autostash) {\n+\t\t\tstruct commit_list *list = NULL;\n+\t\t\tstruct commit *merge_head, *head;\n+\n+\t\t\thead = lookup_commit_reference(orig_head.hash);\n+\t\t\tcommit_list_insert(head, &list);\n+\t\t\tmerge_head = lookup_commit_reference(merge_heads.oid[0].hash);\n+\t\t\tif (is_descendant_of(merge_head, list)) {\n+\t\t\t\t/* we can fast-forward this without invoking rebase */\n+\t\t\t\topt_ff = \"--ff-only\";\n+\t\t\t\treturn run_merge();\n+\t\t\t}\n \t\t}\n \t\treturn run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);\n \t} else {\n\n\n\n> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\n> index 17f4d0fe4e72..4c85be0417cf 100755\n> --- a/t/t5520-pull.sh\n> +++ b/t/t5520-pull.sh\n> @@ -272,6 +272,24 @@ test_expect_success '--rebase fast forward' '\n>  \ttest_cmp reflog.expected reflog.fuzzy\n>  '\n>  \n> +test_expect_success '--rebase --autostash fast forward' '\n> +\ttest_when_finished \"\n> +\t\tgit reset --hard;\n> +\t\tgit checkout to-rebase;\n> +\t\tgit branch -D to-rebase-ff;\n> +\t\tgit branch -D behind\" &&\n\nDo you need these semicolons?  I thought we designed our test\nhelpers and eval's in such a way that we can write these without\nthem (iow, I thought these newlines should suffice).\n\n> +\tgit branch behind &&\n> +\tgit checkout -b to-rebase-ff &&\n> +\techo another modification >>file &&\n> +\tgit add file &&\n> +\tgit commit -m mod &&\n> +\n> +\tgit checkout behind &&\n> +\techo dirty >file &&\n> +\tgit pull --rebase --autostash . to-rebase-ff &&\n> +\ttest \"$(git rev-parse HEAD)\" = \"$(git rev-parse to-rebase-ff)\"\n> +'\n> +\n>  test_expect_success '--rebase with conflicts shows advice' '\n>  \ttest_when_finished \"git rebase --abort; git checkout -f to-rebase\" &&\n>  \tgit checkout -b seq &&\n>\n> --\n> https://github.com/git/git/pull/365\n\n\nThanks.\n"},{"id":"321105","messageId":"0102015c5c7054ac-5ec72a28-ff81-42b8-8224-26a588cef485-000000@eu-west-1.amazonses.com","threadId":"46065","inReplyTo":"0102015c5166284d-d8dd6534-a8d5-452d-af14-d827934ef593-000000@eu-west-1.amazonses.com","subject":"[PATCH v2] pull: ff --rebase --autostash works in dirty repo","fromName":"Tyler Brazier","fromEmail":"tyler@tylerbrazier.com","sentAt":"2017-05-31T02:58:04Z","receivedAt":"2017-05-31T02:58:11Z","isPatch":true,"sender":{"key":"tyler@tylerbrazier.com","avatar":"https://avatars.githubusercontent.com/u/4481528?v=4"},"body":"When `git pull --rebase --autostash` in a dirty repository resulted in a\nfast-forward, nothing was being autostashed and the pull failed. This\nwas due to a shortcut to avoid running rebase when we can fast-forward,\nbut autostash is ignored on that codepath.\n\nNow we will only take the shortcut if autostash is not in effect.\nBased on a few tests against the git.git repo, the shortcut does not\nseem to give us significant performance benefits, on Linux at least.\nRegardless, it is more important to be correct than to be fast.\n---\n builtin/pull.c  | 25 ++++++++++++++-----------\n t/t5520-pull.sh | 18 ++++++++++++++++++\n 2 files changed, 32 insertions(+), 11 deletions(-)\n\ndiff --git a/builtin/pull.c b/builtin/pull.c\nindex dd1a4a94e41e..42f0560252e0 100644\n--- a/builtin/pull.c\n+++ b/builtin/pull.c\n@@ -772,6 +772,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n \tstruct oid_array merge_heads = OID_ARRAY_INIT;\n \tstruct object_id orig_head, curr_head;\n \tstruct object_id rebase_fork_point;\n+\tint autostash;\n \n \tif (!getenv(\"GIT_REFLOG_ACTION\"))\n \t\tset_reflog_message(argc, argv);\n@@ -800,8 +801,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n \tif (!opt_rebase && opt_autostash != -1)\n \t\tdie(_(\"--[no-]autostash option is only valid with --rebase.\"));\n \n+\tautostash = config_autostash;\n \tif (opt_rebase) {\n-\t\tint autostash = config_autostash;\n \t\tif (opt_autostash != -1)\n \t\t\tautostash = opt_autostash;\n \n@@ -862,16 +863,18 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n \t\tdie(_(\"Cannot rebase onto multiple branches.\"));\n \n \tif (opt_rebase) {\n-\t\tstruct commit_list *list = NULL;\n-\t\tstruct commit *merge_head, *head;\n-\n-\t\thead = lookup_commit_reference(orig_head.hash);\n-\t\tcommit_list_insert(head, &list);\n-\t\tmerge_head = lookup_commit_reference(merge_heads.oid[0].hash);\n-\t\tif (is_descendant_of(merge_head, list)) {\n-\t\t\t/* we can fast-forward this without invoking rebase */\n-\t\t\topt_ff = \"--ff-only\";\n-\t\t\treturn run_merge();\n+\t\tif (!autostash) {\n+\t\t\tstruct commit_list *list = NULL;\n+\t\t\tstruct commit *merge_head, *head;\n+\n+\t\t\thead = lookup_commit_reference(orig_head.hash);\n+\t\t\tcommit_list_insert(head, &list);\n+\t\t\tmerge_head = lookup_commit_reference(merge_heads.oid[0].hash);\n+\t\t\tif (is_descendant_of(merge_head, list)) {\n+\t\t\t\t/* we can fast-forward this without invoking rebase */\n+\t\t\t\topt_ff = \"--ff-only\";\n+\t\t\t\treturn run_merge();\n+\t\t\t}\n \t\t}\n \t\treturn run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);\n \t} else {\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex 17f4d0fe4e72..f15f7a332960 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -272,6 +272,24 @@ test_expect_success '--rebase fast forward' '\n \ttest_cmp reflog.expected reflog.fuzzy\n '\n \n+test_expect_success '--rebase --autostash fast forward' '\n+\ttest_when_finished \"\n+\t\tgit reset --hard\n+\t\tgit checkout to-rebase\n+\t\tgit branch -D to-rebase-ff\n+\t\tgit branch -D behind\" &&\n+\tgit branch behind &&\n+\tgit checkout -b to-rebase-ff &&\n+\techo another modification >>file &&\n+\tgit add file &&\n+\tgit commit -m mod &&\n+\n+\tgit checkout behind &&\n+\techo dirty >file &&\n+\tgit pull --rebase --autostash . to-rebase-ff &&\n+\ttest \"$(git rev-parse HEAD)\" = \"$(git rev-parse to-rebase-ff)\"\n+'\n+\n test_expect_success '--rebase with conflicts shows advice' '\n \ttest_when_finished \"git rebase --abort; git checkout -f to-rebase\" &&\n \tgit checkout -b seq &&\n\n--\nhttps://github.com/git/git/pull/365\n"},{"id":"321236","messageId":"xmqqbmq88oeu.fsf@gitster.mtv.corp.google.com","threadId":"46065","inReplyTo":"0102015c5c7054ac-5ec72a28-ff81-42b8-8224-26a588cef485-000000@eu-west-1.amazonses.com","subject":"Re: [PATCH v2] pull: ff --rebase --autostash works in dirty repo","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-06-01T01:52:41Z","receivedAt":"2017-06-01T01:52:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Tyler Brazier <tyler@tylerbrazier.com> writes:\n\n> When `git pull --rebase --autostash` in a dirty repository resulted in a\n> fast-forward, nothing was being autostashed and the pull failed. This\n> was due to a shortcut to avoid running rebase when we can fast-forward,\n> but autostash is ignored on that codepath.\n>\n> Now we will only take the shortcut if autostash is not in effect.\n> Based on a few tests against the git.git repo, the shortcut does not\n> seem to give us significant performance benefits, on Linux at least.\n> Regardless, it is more important to be correct than to be fast.\n> ---\n\nMissing sign-off.\n\nOtherwise, nicely done.  Thanks.\n"},{"id":"321245","messageId":"0102015c61e06acf-70b79f3e-a6a8-43a9-b87d-273c1e2665f3-000000@eu-west-1.amazonses.com","threadId":"46065","inReplyTo":"0102015c5c7054ac-5ec72a28-ff81-42b8-8224-26a588cef485-000000@eu-west-1.amazonses.com","subject":"[PATCH v3] pull: ff --rebase --autostash works in dirty repo","fromName":"Tyler Brazier","fromEmail":"tyler@tylerbrazier.com","sentAt":"2017-06-01T04:18:36Z","receivedAt":"2017-06-01T04:18:43Z","isPatch":true,"sender":{"key":"tyler@tylerbrazier.com","avatar":"https://avatars.githubusercontent.com/u/4481528?v=4"},"body":"When `git pull --rebase --autostash` in a dirty repository resulted in a\nfast-forward, nothing was being autostashed and the pull failed. This\nwas due to a shortcut to avoid running rebase when we can fast-forward,\nbut autostash is ignored on that codepath.\n\nNow we will only take the shortcut if autostash is not in effect.\nBased on a few tests against the git.git repo, the shortcut does not\nseem to give us significant performance benefits, on Linux at least.\nRegardless, it is more important to be correct than to be fast.\n\nSigned-off-by: Tyler Brazier <tyler@tylerbrazier.com>\n---\n builtin/pull.c  | 25 ++++++++++++++-----------\n t/t5520-pull.sh | 18 ++++++++++++++++++\n 2 files changed, 32 insertions(+), 11 deletions(-)\n\ndiff --git a/builtin/pull.c b/builtin/pull.c\nindex dd1a4a94e41ed..42f0560252e00 100644\n--- a/builtin/pull.c\n+++ b/builtin/pull.c\n@@ -772,6 +772,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n \tstruct oid_array merge_heads = OID_ARRAY_INIT;\n \tstruct object_id orig_head, curr_head;\n \tstruct object_id rebase_fork_point;\n+\tint autostash;\n \n \tif (!getenv(\"GIT_REFLOG_ACTION\"))\n \t\tset_reflog_message(argc, argv);\n@@ -800,8 +801,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n \tif (!opt_rebase && opt_autostash != -1)\n \t\tdie(_(\"--[no-]autostash option is only valid with --rebase.\"));\n \n+\tautostash = config_autostash;\n \tif (opt_rebase) {\n-\t\tint autostash = config_autostash;\n \t\tif (opt_autostash != -1)\n \t\t\tautostash = opt_autostash;\n \n@@ -862,16 +863,18 @@ int cmd_pull(int argc, const char **argv, const char *prefix)\n \t\tdie(_(\"Cannot rebase onto multiple branches.\"));\n \n \tif (opt_rebase) {\n-\t\tstruct commit_list *list = NULL;\n-\t\tstruct commit *merge_head, *head;\n-\n-\t\thead = lookup_commit_reference(orig_head.hash);\n-\t\tcommit_list_insert(head, &list);\n-\t\tmerge_head = lookup_commit_reference(merge_heads.oid[0].hash);\n-\t\tif (is_descendant_of(merge_head, list)) {\n-\t\t\t/* we can fast-forward this without invoking rebase */\n-\t\t\topt_ff = \"--ff-only\";\n-\t\t\treturn run_merge();\n+\t\tif (!autostash) {\n+\t\t\tstruct commit_list *list = NULL;\n+\t\t\tstruct commit *merge_head, *head;\n+\n+\t\t\thead = lookup_commit_reference(orig_head.hash);\n+\t\t\tcommit_list_insert(head, &list);\n+\t\t\tmerge_head = lookup_commit_reference(merge_heads.oid[0].hash);\n+\t\t\tif (is_descendant_of(merge_head, list)) {\n+\t\t\t\t/* we can fast-forward this without invoking rebase */\n+\t\t\t\topt_ff = \"--ff-only\";\n+\t\t\t\treturn run_merge();\n+\t\t\t}\n \t\t}\n \t\treturn run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);\n \t} else {\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex 17f4d0fe4e724..f15f7a332960f 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -272,6 +272,24 @@ test_expect_success '--rebase fast forward' '\n \ttest_cmp reflog.expected reflog.fuzzy\n '\n \n+test_expect_success '--rebase --autostash fast forward' '\n+\ttest_when_finished \"\n+\t\tgit reset --hard\n+\t\tgit checkout to-rebase\n+\t\tgit branch -D to-rebase-ff\n+\t\tgit branch -D behind\" &&\n+\tgit branch behind &&\n+\tgit checkout -b to-rebase-ff &&\n+\techo another modification >>file &&\n+\tgit add file &&\n+\tgit commit -m mod &&\n+\n+\tgit checkout behind &&\n+\techo dirty >file &&\n+\tgit pull --rebase --autostash . to-rebase-ff &&\n+\ttest \"$(git rev-parse HEAD)\" = \"$(git rev-parse to-rebase-ff)\"\n+'\n+\n test_expect_success '--rebase with conflicts shows advice' '\n \ttest_when_finished \"git rebase --abort; git checkout -f to-rebase\" &&\n \tgit checkout -b seq &&\n\n--\nhttps://github.com/git/git/pull/365\n"},{"id":"321269","messageId":"xmqq60gg59ju.fsf@gitster.mtv.corp.google.com","threadId":"46065","inReplyTo":"0102015c61e06acf-70b79f3e-a6a8-43a9-b87d-273c1e2665f3-000000@eu-west-1.amazonses.com","subject":"Re: [PATCH v3] pull: ff --rebase --autostash works in dirty repo","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-06-01T09:41:57Z","receivedAt":"2017-06-01T09:42:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}