{"thread":{"id":"36401","subject":"[PATCH v9 0/6] transport-helper: fixes","startedAt":"2014-04-12T20:12:49Z","lastAt":"2014-04-19T01:09:11Z","messageCount":11,"participants":["Felipe Contreras","Junio C Hamano"],"isPatch":true,"patchVersion":9,"patchTotal":6},"messages":[{"id":"238780","messageId":"1397333575-11614-1-git-send-email-felipe.contreras@gmail.com","threadId":"36401","inReplyTo":null,"subject":"[PATCH v9 0/6] transport-helper: fixes","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2014-04-12T20:12:49Z","receivedAt":"2014-04-12T20:12:49Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Hi,\n\nThese patches add support for remote helpers --force, --dry-run, and reporting\nforced update.\n\nChanges since v8:\n\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf,\n }\n \n (*ref)->status = status;\n- (*ref)->forced_update = forced;\n+ (*ref)->forced_update |= forced;\n (*ref)->remote_status = msg;\n return !(status == REF_STATUS_OK);\n }\n\nFelipe Contreras (4):\n transport-helper: mismerge fix\n transport-helper: don't update refs in dry-run\n transport-helper: add 'force' to 'export' helpers\n transport-helper: check for 'forced update' message\n\nRichard Hansen (2):\n test-hg.sh: tests are now expected to pass\n remote-bzr: support the new 'force' option\n\n Documentation/gitremote-helpers.txt | 4 ++++\n contrib/remote-helpers/git-remote-bzr | 31 ++++++++++++++++++++++++++++++-\n contrib/remote-helpers/test-bzr.sh | 22 +++++++++++++++++++++-\n contrib/remote-helpers/test-hg.sh | 4 ++--\n git-remote-testgit.sh | 18 ++++++++++++++++++\n t/t5801-remote-helpers.sh | 13 +++++++++++++\n transport-helper.c | 25 +++++++++++++++++--------\n 7 files changed, 105 insertions(+), 12 deletions(-)\n\n-- \n1.9.1+fc3.9.gc73078e\n"},{"id":"238781","messageId":"1397333575-11614-2-git-send-email-felipe.contreras@gmail.com","threadId":"36401","inReplyTo":"1397333575-11614-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v9 1/6] transport-helper: mismerge fix","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2014-04-12T20:12:50Z","receivedAt":"2014-04-12T20:12:50Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Commit 9c51558 (transport-helper: trivial code shuffle) moved these\nlines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')\nhad a wrong merge conflict and readded them.\n\nReported-by: Richard Hansen \nSigned-off-by: Felipe Contreras \nSigned-off-by: Junio C Hamano \n---\n transport-helper.c | 3 ---\n 1 file changed, 3 deletions(-)\n\ndiff --git a/transport-helper.c b/transport-helper.c\nindex ad72fbd..ea34d0c 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -881,9 +881,6 @@ static int push_refs_with_export(struct transport *transport,\n \t\t}\n \t\tfree(private);\n \n-\t\tif (ref->deletion)\n-\t\t\tdie(\"remote-helpers do not support ref deletion\");\n-\n \t\tif (ref->peer_ref) {\n \t\t\tif (strcmp(ref->peer_ref->name, ref->name))\n \t\t\t\tdie(\"remote-helpers do not support old:new syntax\");\n-- \n1.9.1+fc3.9.gc73078e\n"},{"id":"238786","messageId":"1397333575-11614-3-git-send-email-felipe.contreras@gmail.com","threadId":"36401","inReplyTo":"1397333575-11614-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v9 2/6] transport-helper: don't update refs in dry-run","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2014-04-12T20:12:51Z","receivedAt":"2014-04-12T20:12:51Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"The remote helper namespace should not be updated.\n\nSigned-off-by: Felipe Contreras \nSigned-off-by: Junio C Hamano \n---\n transport-helper.c | 9 +++++----\n 1 file changed, 5 insertions(+), 4 deletions(-)\n\ndiff --git a/transport-helper.c b/transport-helper.c\nindex ea34d0c..4b3e38e 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -734,7 +734,8 @@ static int push_update_ref_status(struct strbuf *buf,\n }\n \n static void push_update_refs_status(struct helper_data *data,\n-\t\t\t\t struct ref *remote_refs)\n+\t\t\t\t struct ref *remote_refs,\n+\t\t\t\t int flags)\n {\n \tstruct strbuf buf = STRBUF_INIT;\n \tstruct ref *ref = remote_refs;\n@@ -748,7 +749,7 @@ static void push_update_refs_status(struct helper_data *data,\n \t\tif (push_update_ref_status(&buf, &ref, remote_refs))\n \t\t\tcontinue;\n \n-\t\tif (!data->refspecs || data->no_private_update)\n+\t\tif (flags & TRANSPORT_PUSH_DRY_RUN || !data->refspecs || data->no_private_update)\n \t\t\tcontinue;\n \n \t\t/* propagate back the update to the remote namespace */\n@@ -839,7 +840,7 @@ static int push_refs_with_push(struct transport *transport,\n \tsendline(data, &buf);\n \tstrbuf_release(&buf);\n \n-\tpush_update_refs_status(data, remote_refs);\n+\tpush_update_refs_status(data, remote_refs, flags);\n \treturn 0;\n }\n \n@@ -893,7 +894,7 @@ static int push_refs_with_export(struct transport *transport,\n \n \tif (finish_command(&exporter))\n \t\tdie(\"Error while running fast-export\");\n-\tpush_update_refs_status(data, remote_refs);\n+\tpush_update_refs_status(data, remote_refs, flags);\n \treturn 0;\n }\n \n-- \n1.9.1+fc3.9.gc73078e\n"},{"id":"238782","messageId":"1397333575-11614-4-git-send-email-felipe.contreras@gmail.com","threadId":"36401","inReplyTo":"1397333575-11614-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v9 3/6] transport-helper: add 'force' to 'export' helpers","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2014-04-12T20:12:52Z","receivedAt":"2014-04-12T20:12:52Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Otherwise they cannot know when to force the push or not (other than\nhacks).\n\nTests-by: Richard Hansen \nDocumentation-by: Richard Hansen \nSigned-off-by: Felipe Contreras \nSigned-off-by: Junio C Hamano \n---\n Documentation/gitremote-helpers.txt | 4 ++++\n git-remote-testgit.sh | 18 ++++++++++++++++++\n t/t5801-remote-helpers.sh | 13 +++++++++++++\n transport-helper.c | 5 +++++\n 4 files changed, 40 insertions(+)\n\ndiff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt\nindex c2908db..c24c0c2 100644\n--- a/Documentation/gitremote-helpers.txt\n+++ b/Documentation/gitremote-helpers.txt\n@@ -444,6 +444,10 @@ set by Git if the remote helper has the 'option' capability.\n 'option update-shallow \\{'true'|'false'\\}::\n \tAllow to extend .git/shallow if the new refs require it.\n \n+'option force' \\{'true'|'false'\\}::\n+\tRequest the helper to perform a force update. Defaults to\n+\t'false'.\n+\n SEE ALSO\n --------\n linkgit:git-remote[1]\ndiff --git a/git-remote-testgit.sh b/git-remote-testgit.sh\nindex 6d2f282..1c006a0 100755\n--- a/git-remote-testgit.sh\n+++ b/git-remote-testgit.sh\n@@ -15,6 +15,8 @@ test -z \"$refspec\" && prefix=\"refs\"\n \n export GIT_DIR=\"$url/.git\"\n \n+force=\n+\n mkdir -p \"$dir\"\n \n if test -z \"$GIT_REMOTE_TESTGIT_NO_MARKS\"\n@@ -39,6 +41,7 @@ do\n \t\tfi\n \t\ttest -n \"$GIT_REMOTE_TESTGIT_SIGNED_TAGS\" && echo \"signed-tags\"\n \t\ttest -n \"$GIT_REMOTE_TESTGIT_NO_PRIVATE_UPDATE\" && echo \"no-private-update\"\n+\t\techo 'option'\n \t\techo\n \t\t;;\n \tlist)\n@@ -93,6 +96,7 @@ do\n \t\tbefore=$(git for-each-ref --format=' %(refname) %(objectname) ')\n \n \t\tgit fast-import \\\n+\t\t\t${force:+--force} \\\n \t\t\t${testgitmarks:+\"--import-marks=$testgitmarks\"} \\\n \t\t\t${testgitmarks:+\"--export-marks=$testgitmarks\"} \\\n \t\t\t--quiet\n@@ -115,6 +119,20 @@ do\n \n \t\techo\n \t\t;;\n+\toption\\ *)\n+\t\tread cmd opt val <<-EOF\n+\t\t$line\n+\t\tEOF\n+\t\tcase $opt in\n+\t\tforce)\n+\t\t\ttest $val = \"true\" && force=\"true\" || force=\n+\t\t\techo \"ok\"\n+\t\t\t;;\n+\t\t*)\n+\t\t\techo \"unsupported\"\n+\t\t\t;;\n+\t\tesac\n+\t\t;;\n \t'')\n \t\texit\n \t\t;;\ndiff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh\nindex 613f69a..c33cc25 100755\n--- a/t/t5801-remote-helpers.sh\n+++ b/t/t5801-remote-helpers.sh\n@@ -94,6 +94,19 @@ test_expect_failure 'push new branch with old:new refspec' '\n \tcompare_refs local HEAD server refs/heads/new-refspec\n '\n \n+test_expect_success 'forced push' '\n+\t(cd local &&\n+\tgit checkout -b force-test &&\n+\techo content >> file &&\n+\tgit commit -a -m eight &&\n+\tgit push origin force-test &&\n+\techo content >> file &&\n+\tgit commit -a --amend -m eight-modified &&\n+\tgit push --force origin force-test\n+\t) &&\n+\tcompare_refs local refs/heads/force-test server refs/heads/force-test\n+'\n+\n test_expect_success 'cloning without refspec' '\n \tGIT_REMOTE_TESTGIT_REFSPEC=\"\" \\\n \tgit clone \"testgit::${PWD}/server\" local2 2>error &&\ndiff --git a/transport-helper.c b/transport-helper.c\nindex 4b3e38e..f50e84f 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -861,6 +861,11 @@ static int push_refs_with_export(struct transport *transport,\n \t\t\tdie(\"helper %s does not support dry-run\", data->name);\n \t}\n \n+\tif (flags & TRANSPORT_PUSH_FORCE) {\n+\t\tif (set_helper_option(transport, \"force\", \"true\") != 0)\n+\t\t\twarning(\"helper %s does not support 'force'\", data->name);\n+\t}\n+\n \thelper = get_helper(transport);\n \n \twrite_constant(helper->in, \"export\\n\");\n-- \n1.9.1+fc3.9.gc73078e\n"},{"id":"238785","messageId":"1397333575-11614-5-git-send-email-felipe.contreras@gmail.com","threadId":"36401","inReplyTo":"1397333575-11614-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v9 4/6] transport-helper: check for 'forced update' message","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2014-04-12T20:12:53Z","receivedAt":"2014-04-12T20:12:53Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"So the remote-helpers can tell us when a forced push was needed.\n\nHelped-by: Max Horn \nSigned-off-by: Felipe Contreras \nSigned-off-by: Junio C Hamano \n---\n transport-helper.c | 8 +++++++-\n 1 file changed, 7 insertions(+), 1 deletion(-)\n\ndiff --git a/transport-helper.c b/transport-helper.c\nindex f50e84f..86e1679 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -650,7 +650,7 @@ static int push_update_ref_status(struct strbuf *buf,\n \t\t\t\t struct ref *remote_refs)\n {\n \tchar *refname, *msg;\n-\tint status;\n+\tint status, forced = 0;\n \n \tif (starts_with(buf->buf, \"ok \")) {\n \t\tstatus = REF_STATUS_OK;\n@@ -708,6 +708,11 @@ static int push_update_ref_status(struct strbuf *buf,\n \t\t\tfree(msg);\n \t\t\tmsg = NULL;\n \t\t}\n+\t\telse if (!strcmp(msg, \"forced update\")) {\n+\t\t\tforced = 1;\n+\t\t\tfree(msg);\n+\t\t\tmsg = NULL;\n+\t\t}\n \t}\n \n \tif (*ref)\n@@ -729,6 +734,7 @@ static int push_update_ref_status(struct strbuf *buf,\n \t}\n \n \t(*ref)->status = status;\n+\t(*ref)->forced_update |= forced;\n \t(*ref)->remote_status = msg;\n \treturn !(status == REF_STATUS_OK);\n }\n-- \n1.9.1+fc3.9.gc73078e\n"},{"id":"238783","messageId":"1397333575-11614-6-git-send-email-felipe.contreras@gmail.com","threadId":"36401","inReplyTo":"1397333575-11614-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v9 5/6] test-hg.sh: tests are now expected to pass","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2014-04-12T20:12:54Z","receivedAt":"2014-04-12T20:12:54Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"From: Richard Hansen \n\nSigned-off-by: Richard Hansen \nSigned-off-by: Junio C Hamano \nSigned-off-by: Felipe Contreras \n---\n contrib/remote-helpers/test-hg.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh\nindex 5d128a5..a933b1e 100755\n--- a/contrib/remote-helpers/test-hg.sh\n+++ b/contrib/remote-helpers/test-hg.sh\n@@ -680,7 +680,7 @@ test_expect_success 'remote big push fetch first' '\n \t)\n '\n \n-test_expect_failure 'remote big push force' '\n+test_expect_success 'remote big push force' '\n \ttest_when_finished \"rm -rf hgrepo gitrepo*\" &&\n \n \tsetup_big_push\n@@ -710,7 +710,7 @@ test_expect_failure 'remote big push force' '\n \tcheck_bookmark hgrepo new_bmark six\n '\n \n-test_expect_failure 'remote big push dry-run' '\n+test_expect_success 'remote big push dry-run' '\n \ttest_when_finished \"rm -rf hgrepo gitrepo*\" &&\n \n \tsetup_big_push\n-- \n1.9.1+fc3.9.gc73078e\n"},{"id":"238784","messageId":"1397333575-11614-7-git-send-email-felipe.contreras@gmail.com","threadId":"36401","inReplyTo":"1397333575-11614-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH v9 6/6] remote-bzr: support the new 'force' option","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2014-04-12T20:12:55Z","receivedAt":"2014-04-12T20:12:55Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"From: Richard Hansen \n\nSigned-off-by: Richard Hansen \nAcked-by: Felipe Contreras \nSigned-off-by: Junio C Hamano \nSigned-off-by: Felipe Contreras \n---\n contrib/remote-helpers/git-remote-bzr | 31 ++++++++++++++++++++++++++++++-\n contrib/remote-helpers/test-bzr.sh | 22 +++++++++++++++++++++-\n 2 files changed, 51 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr\nindex 332aba7..5f4b2e3 100755\n--- a/contrib/remote-helpers/git-remote-bzr\n+++ b/contrib/remote-helpers/git-remote-bzr\n@@ -684,7 +684,8 @@ def do_export(parser):\n peer = bzrlib.branch.Branch.open(peers[name],\n possible_transports=transports)\n try:\n- peer.bzrdir.push_branch(branch, revision_id=revid)\n+ peer.bzrdir.push_branch(branch, revision_id=revid,\n+ overwrite=force)\n except bzrlib.errors.DivergedBranches:\n print \"error %s non-fast forward\" % ref\n continue\n@@ -718,8 +719,32 @@ def do_capabilities(parser):\n print \"*import-marks %s\" % path\n print \"*export-marks %s\" % path\n \n+ print \"option\"\n print\n \n+class InvalidOptionValue(Exception):\n+ pass\n+\n+def get_bool_option(val):\n+ if val == 'true':\n+ return True\n+ elif val == 'false':\n+ return False\n+ else:\n+ raise InvalidOptionValue()\n+\n+def do_option(parser):\n+ global force\n+ opt, val = parser[1:3]\n+ try:\n+ if opt == 'force':\n+ force = get_bool_option(val)\n+ print 'ok'\n+ else:\n+ print 'unsupported'\n+ except InvalidOptionValue:\n+ print \"error '%s' is not a valid value for option '%s'\" % (val, opt)\n+\n def ref_is_valid(name):\n return not True in [c in name for c in '~^: \\\\']\n \n@@ -882,6 +907,7 @@ def main(args):\n global is_tmp\n global branches, peers\n global transports\n+ global force\n \n marks = None\n is_tmp = False\n@@ -904,6 +930,7 @@ def main(args):\n branches = {}\n peers = {}\n transports = []\n+ force = False\n \n if alias[5:] == url:\n is_tmp = True\n@@ -936,6 +963,8 @@ def main(args):\n do_import(parser)\n elif parser.check('export'):\n do_export(parser)\n+ elif parser.check('option'):\n+ do_option(parser)\n else:\n die('unhandled command: %s' % line)\n sys.stdout.flush()\ndiff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh\nindex 1e53ff9..4f379c2 100755\n--- a/contrib/remote-helpers/test-bzr.sh\n+++ b/contrib/remote-helpers/test-bzr.sh\n@@ -66,13 +66,33 @@ test_expect_success 'pushing' '\n \ttest_cmp expected actual\n '\n \n+test_expect_success 'forced pushing' '\n+\t(\n+\tcd gitrepo &&\n+\techo three-new >content &&\n+\tgit commit -a --amend -m three-new &&\n+\tgit push -f\n+\t) &&\n+\n+\t(\n+\tcd bzrrepo &&\n+\t# the forced update overwrites the bzr branch but not the bzr\n+\t# working directory (it tries to merge instead)\n+\tbzr revert\n+\t) &&\n+\n+\techo three-new >expected &&\n+\tcat bzrrepo/content >actual &&\n+\ttest_cmp expected actual\n+'\n+\n test_expect_success 'roundtrip' '\n \t(\n \tcd gitrepo &&\n \tgit pull &&\n \tgit log --format=\"%s\" -1 origin/master >actual\n \t) &&\n-\techo three >expected &&\n+\techo three-new >expected &&\n \ttest_cmp expected actual &&\n \n \t(cd gitrepo && git push && git pull) &&\n-- \n1.9.1+fc3.9.gc73078e\n"},{"id":"238865","messageId":"xmqq61mbod8y.fsf@gitster.dls.corp.google.com","threadId":"36401","inReplyTo":"1397333575-11614-1-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH v9 0/6] transport-helper: fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-04-14T20:41:17Z","receivedAt":"2014-04-14T20:41:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras writes:\n\n> These patches add support for remote helpers --force, --dry-run, and reporting\n> forced update.\n>\n> Changes since v8:\n>\n> --- a/transport-helper.c\n> +++ b/transport-helper.c\n> @@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf,\n> }\n> \n> (*ref)->status = status;\n> - (*ref)->forced_update = forced;\n> + (*ref)->forced_update |= forced;\n> (*ref)->remote_status = msg;\n> return !(status == REF_STATUS_OK);\n> }\n\nHmph, isn't v8 already in 'master' as of 90e6255a (Merge branch\n'fc/transport-helper-fixes', 2014-03-18)?\n\n\n> Felipe Contreras (4):\n> transport-helper: mismerge fix\n> transport-helper: don't update refs in dry-run\n> transport-helper: add 'force' to 'export' helpers\n> transport-helper: check for 'forced update' message\n>\n> Richard Hansen (2):\n> test-hg.sh: tests are now expected to pass\n> remote-bzr: support the new 'force' option\n>\n> Documentation/gitremote-helpers.txt | 4 ++++\n> contrib/remote-helpers/git-remote-bzr | 31 ++++++++++++++++++++++++++++++-\n> contrib/remote-helpers/test-bzr.sh | 22 +++++++++++++++++++++-\n> contrib/remote-helpers/test-hg.sh | 4 ++--\n> git-remote-testgit.sh | 18 ++++++++++++++++++\n> t/t5801-remote-helpers.sh | 13 +++++++++++++\n> transport-helper.c | 25 +++++++++++++++++--------\n> 7 files changed, 105 insertions(+), 12 deletions(-)\n"},{"id":"238904","messageId":"xmqqfvlejnef.fsf@gitster.dls.corp.google.com","threadId":"36401","inReplyTo":"xmqq61mbod8y.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v9 0/6] transport-helper: fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-04-15T21:25:28Z","receivedAt":"2014-04-15T21:25:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Felipe Contreras writes:\n>\n>> These patches add support for remote helpers --force, --dry-run, and reporting\n>> forced update.\n>>\n>> Changes since v8:\n>>\n>> --- a/transport-helper.c\n>> +++ b/transport-helper.c\n>> @@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf,\n>> }\n>> \n>> (*ref)->status = status;\n>> - (*ref)->forced_update = forced;\n>> + (*ref)->forced_update |= forced;\n>> (*ref)->remote_status = msg;\n>> return !(status == REF_STATUS_OK);\n>> }\n>\n> Hmph, isn't v8 already in 'master' as of 90e6255a (Merge branch\n> 'fc/transport-helper-fixes', 2014-03-18)?\n\nI checked and it seems to be that way. If there are new development\nthat are missing in my tree, please send in incrementals.\n\nThanks.\n"},{"id":"239087","messageId":"5351b6219fce_3497cdf30c6e@nysa.notmuch","threadId":"36401","inReplyTo":"xmqq61mbod8y.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v9 0/6] transport-helper: fixes","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2014-04-18T23:32:49Z","receivedAt":"2014-04-18T23:32:49Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Junio C Hamano wrote:\n> Felipe Contreras writes:\n> \n> > These patches add support for remote helpers --force, --dry-run, and reporting\n> > forced update.\n> >\n> > Changes since v8:\n> >\n> > --- a/transport-helper.c\n> > +++ b/transport-helper.c\n> > @@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf,\n> > }\n> > \n> > (*ref)->status = status;\n> > - (*ref)->forced_update = forced;\n> > + (*ref)->forced_update |= forced;\n> > (*ref)->remote_status = msg;\n> > return !(status == REF_STATUS_OK);\n> > }\n> \n> Hmph, isn't v8 already in 'master' as of 90e6255a (Merge branch\n> 'fc/transport-helper-fixes', 2014-03-18)?\n\nI think I saw gitk report \"Branches: remotes/origin/pu\", but OK.\n\n-- \nFelipe Contreras\n"},{"id":"239093","messageId":"xmqqtx9q9lc8.fsf@gitster.dls.corp.google.com","threadId":"36401","inReplyTo":"5351b6219fce_3497cdf30c6e@nysa.notmuch","subject":"Re: [PATCH v9 0/6] transport-helper: fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-04-19T01:09:11Z","receivedAt":"2014-04-19T01:09:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras writes:\n\n> Junio C Hamano wrote:\n>> Felipe Contreras writes:\n>> \n>> > These patches add support for remote helpers --force, --dry-run, and reporting\n>> > forced update.\n>> >\n>> > Changes since v8:\n>> >\n>> > --- a/transport-helper.c\n>> > +++ b/transport-helper.c\n>> > @@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf,\n>> > }\n>> > \n>> > (*ref)->status = status;\n>> > - (*ref)->forced_update = forced;\n>> > + (*ref)->forced_update |= forced;\n>> > (*ref)->remote_status = msg;\n>> > return !(status == REF_STATUS_OK);\n>> > }\n>> \n>> Hmph, isn't v8 already in 'master' as of 90e6255a (Merge branch\n>> 'fc/transport-helper-fixes', 2014-03-18)?\n>\n> I think I saw gitk report \"Branches: remotes/origin/pu\", but OK.\n\nI don't get that \"but\" part, but as I said, if what you wanted to\napply has further updates relative to what we have, please send in\nincremental. The patches did not apply cleanly near the tip of\n'master', so I didn't check what could be missing myself.\n\nThanks.\n"}]}