Re: [PATCH v9 0/6] transport-helper: fixes
Felipe Contreras writes: > Junio C Hamano wrote: >> Felipe Contreras writes: >> >> > These patches add support for remote helpers --force, --dry-run, and >> > reporting >> > forced update. >> > >> > Changes since v8: >> > >> > --- a/transport-helper.c >> > +++ b/transport-helper.c >> > @@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf, >> > } >> > >> > (*ref)->status = status; >> > - (*ref)->forced_update = forced; >> > + (*ref)->forced_update |= forced; >> > (*ref)->remote_status = msg; >> > return !(status == REF_STATUS_OK); >> > } >> >> Hmph, isn't v8 already in 'master' as of 90e6255a (Merge branch >> 'fc/transport-helper-fixes', 2014-03-18)? > > I think I saw gitk report "Branches: remotes/origin/pu", but OK. I don't get that "but" part, but as I said, if what you wanted to apply has further updates relative to what we have, please send in incremental. The patches did not apply cleanly near the tip of 'master', so I didn't check what could be missing myself. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v9 0/6] transport-helper: fixes
Junio C Hamano wrote: > Felipe Contreras writes: > > > These patches add support for remote helpers --force, --dry-run, and > > reporting > > forced update. > > > > Changes since v8: > > > > --- a/transport-helper.c > > +++ b/transport-helper.c > > @@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf, > > } > > > > (*ref)->status = status; > > - (*ref)->forced_update = forced; > > + (*ref)->forced_update |= forced; > > (*ref)->remote_status = msg; > > return !(status == REF_STATUS_OK); > > } > > Hmph, isn't v8 already in 'master' as of 90e6255a (Merge branch > 'fc/transport-helper-fixes', 2014-03-18)? I think I saw gitk report "Branches: remotes/origin/pu", but OK. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v9 0/6] transport-helper: fixes
Junio C Hamano writes: > Felipe Contreras writes: > >> These patches add support for remote helpers --force, --dry-run, and >> reporting >> forced update. >> >> Changes since v8: >> >> --- a/transport-helper.c >> +++ b/transport-helper.c >> @@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf, >> } >> >> (*ref)->status = status; >> - (*ref)->forced_update = forced; >> + (*ref)->forced_update |= forced; >> (*ref)->remote_status = msg; >> return !(status == REF_STATUS_OK); >> } > > Hmph, isn't v8 already in 'master' as of 90e6255a (Merge branch > 'fc/transport-helper-fixes', 2014-03-18)? I checked and it seems to be that way. If there are new development that are missing in my tree, please send in incrementals. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v9 0/6] transport-helper: fixes
Felipe Contreras writes: > These patches add support for remote helpers --force, --dry-run, and reporting > forced update. > > Changes since v8: > > --- a/transport-helper.c > +++ b/transport-helper.c > @@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf, > } > > (*ref)->status = status; > - (*ref)->forced_update = forced; > + (*ref)->forced_update |= forced; > (*ref)->remote_status = msg; > return !(status == REF_STATUS_OK); > } Hmph, isn't v8 already in 'master' as of 90e6255a (Merge branch 'fc/transport-helper-fixes', 2014-03-18)? > Felipe Contreras (4): > transport-helper: mismerge fix > transport-helper: don't update refs in dry-run > transport-helper: add 'force' to 'export' helpers > transport-helper: check for 'forced update' message > > Richard Hansen (2): > test-hg.sh: tests are now expected to pass > remote-bzr: support the new 'force' option > > Documentation/gitremote-helpers.txt | 4 > contrib/remote-helpers/git-remote-bzr | 31 ++- > contrib/remote-helpers/test-bzr.sh| 22 +- > contrib/remote-helpers/test-hg.sh | 4 ++-- > git-remote-testgit.sh | 18 ++ > t/t5801-remote-helpers.sh | 13 + > transport-helper.c| 25 + > 7 files changed, 105 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
