[PATCH v6 00/10] transport-helper: updates
Hi,
Here are the patches that allow transport helpers to be completely transparent;
renaming branches, deleting them, custom refspecs, --force, --dry-run,
reporting forced update, everything works.
Small changes since v5:
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 8ed41b4..4b76222 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -736,9 +736,10 @@ int cmd_fast_export(int argc, const char **argv, const
char *prefix)
usage_with_options (fast_export_usage, options);
if (refspecs_list.nr) {
- const char *refspecs_str[refspecs_list.nr];
+ const char **refspecs_str;
int i;
+ refspecs_str = xmalloc(sizeof(*refspecs_str) *
refspecs_list.nr);
for (i = 0; i < refspecs_list.nr; i++)
refspecs_str[i] = refspecs_list.items[i].string;
@@ -746,6 +747,7 @@ int cmd_fast_export(int argc, const char **argv, const char
*prefix)
refspecs = parse_fetch_refspec(refspecs_nr, refspecs_str);
string_list_clear(&refspecs_list, 1);
+ free(refspecs_str);
}
if (use_done_feature)
diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh
index 716aa4c..1c006a0 100755
--- a/git-remote-testgit.sh
+++ b/git-remote-testgit.sh
@@ -15,6 +15,8 @@ test -z "$refspec" && prefix="refs"
export GIT_DIR="$url/.git"
+force=
+
mkdir -p "$dir"
if test -z "$GIT_REMOTE_TESTGIT_NO_MARKS"
Felipe Contreras (10):
transport-helper: fix extra lines
transport-helper: don't update refs in dry-run
transport-helper: add 'force' to 'export' helpers
transport-helper: check for 'forced update' message
fast-export: improve argument parsing
fast-export: add new --refspec option
transport-helper: add support for old:new refspec
fast-import: add support to delete refs
fast-export: add support to delete refs
transport-helper: add support to delete branches
Documentation/git-fast-export.txt | 4 +++
Documentation/git-fast-import.txt | 3 +++
Documentation/gitremote-helpers.txt | 4 +++
builtin/fast-export.c | 49 -
fast-import.c | 13 +++---
git-remote-testgit.sh | 18 ++
t/t5801-remote-helpers.sh | 23 -
t/t9300-fast-import.sh | 18 ++
t/t9350-fast-export.sh | 18 ++
transport-helper.c | 47 +++
10 files changed, 177 insertions(+), 20 deletions(-)
--
1.8.4.2+fc1
--
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 v6 00/10] transport-helper: updates
Felipe Contreras writes: > Here are the patches that allow transport helpers to be completely > transparent; > renaming branches, deleting them, custom refspecs, --force, --dry-run, > reporting forced update, everything works. How are you sending your patches? The Message-ID's suggest that git-send-email is being used, but when the patches are ordered by the sender datestamp, they seem to come out in a random order, unlike the patches other people send with git-send-email. git-send-email gives a timestamp to the first message it sends out and then gives consecutive timestamps, one second apart, to subsequent messages, in order to make this "sorting by sender timestamp on Date: field" work. I am wondering if there is something you are doing differently, and/or if there is something that needs to be fixed in the version of git-send-email you are using. 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 v6 00/10] transport-helper: updates
Felipe Contreras writes:
> Small changes since v5:
>
> diff --git a/builtin/fast-export.c b/builtin/fast-export.c
> index 8ed41b4..4b76222 100644
> --- a/builtin/fast-export.c
> +++ b/builtin/fast-export.c
> @@ -736,9 +736,10 @@ int cmd_fast_export(int argc, const char **argv, const
> char *prefix)
> usage_with_options (fast_export_usage, options);
>
> if (refspecs_list.nr) {
> - const char *refspecs_str[refspecs_list.nr];
> + const char **refspecs_str;
> int i;
>
> + refspecs_str = xmalloc(sizeof(*refspecs_str) *
> refspecs_list.nr);
> for (i = 0; i < refspecs_list.nr; i++)
> refspecs_str[i] = refspecs_list.items[i].string;
>
> @@ -746,6 +747,7 @@ int cmd_fast_export(int argc, const char **argv, const
> char *prefix)
> refspecs = parse_fetch_refspec(refspecs_nr, refspecs_str);
>
> string_list_clear(&refspecs_list, 1);
> + free(refspecs_str);
> }
>
> if (use_done_feature)
> diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh
> index 716aa4c..1c006a0 100755
> --- a/git-remote-testgit.sh
> +++ b/git-remote-testgit.sh
> @@ -15,6 +15,8 @@ test -z "$refspec" && prefix="refs"
>
> export GIT_DIR="$url/.git"
>
> +force=
> +
> mkdir -p "$dir"
>
> if test -z "$GIT_REMOTE_TESTGIT_NO_MARKS"
Looking good, modulo a few minor nits I noticed while comparing with
the one that has been queued in 'pu', which I commented separately.
Will re-queue. 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 v6 00/10] transport-helper: updates
On Mon, Nov 11, 2013 at 5:33 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> Here are the patches that allow transport helpers to be completely >> transparent; >> renaming branches, deleting them, custom refspecs, --force, --dry-run, >> reporting forced update, everything works. > > How are you sending your patches? % git-send-email --no-annotate list-of-patches However, I just noticed that the list-of-patches is in the wrong order. -- 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 v6 00/10] transport-helper: updates
On 2013-11-11 17:54, Felipe Contreras wrote:
> Hi,
>
> Here are the patches that allow transport helpers to be completely
> transparent;
> renaming branches, deleting them, custom refspecs, --force, --dry-run,
> reporting forced update, everything works.
>
> Small changes since v5:
>
> diff --git a/builtin/fast-export.c b/builtin/fast-export.c
> index 8ed41b4..4b76222 100644
> --- a/builtin/fast-export.c
> +++ b/builtin/fast-export.c
> @@ -736,9 +736,10 @@ int cmd_fast_export(int argc, const char **argv, const
> char *prefix)
> usage_with_options (fast_export_usage, options);
>
> if (refspecs_list.nr) {
> - const char *refspecs_str[refspecs_list.nr];
> + const char **refspecs_str;
> int i;
>
> + refspecs_str = xmalloc(sizeof(*refspecs_str) *
> refspecs_list.nr);
> for (i = 0; i < refspecs_list.nr; i++)
> refspecs_str[i] = refspecs_list.items[i].string;
>
> @@ -746,6 +747,7 @@ int cmd_fast_export(int argc, const char **argv, const
> char *prefix)
> refspecs = parse_fetch_refspec(refspecs_nr, refspecs_str);
>
> string_list_clear(&refspecs_list, 1);
> + free(refspecs_str);
> }
>
> if (use_done_feature)
> diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh
> index 716aa4c..1c006a0 100755
> --- a/git-remote-testgit.sh
> +++ b/git-remote-testgit.sh
> @@ -15,6 +15,8 @@ test -z "$refspec" && prefix="refs"
>
> export GIT_DIR="$url/.git"
>
> +force=
> +
> mkdir -p "$dir"
>
> if test -z "$GIT_REMOTE_TESTGIT_NO_MARKS"
What about changing those two test-hg.sh tests to test_expect_success?
http://article.gmane.org/gmane.comp.version-control.git/237606
Should those changes be squashed into the "transport-helper: don't
update refs in dry-run" and "transport-helper: add 'force' to 'export'
helpers" commits? Or are those commits not really the appropriate place?
Thanks,
Richard
--
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 v6 00/10] transport-helper: updates
Richard Hansen wrote:
> On 2013-11-11 17:54, Felipe Contreras wrote:
> > Hi,
> >
> > Here are the patches that allow transport helpers to be completely
> > transparent;
> > renaming branches, deleting them, custom refspecs, --force, --dry-run,
> > reporting forced update, everything works.
> >
> > Small changes since v5:
> >
> > diff --git a/builtin/fast-export.c b/builtin/fast-export.c
> > index 8ed41b4..4b76222 100644
> > --- a/builtin/fast-export.c
> > +++ b/builtin/fast-export.c
> > @@ -736,9 +736,10 @@ int cmd_fast_export(int argc, const char **argv, const
> > char *prefix)
> > usage_with_options (fast_export_usage, options);
> >
> > if (refspecs_list.nr) {
> > - const char *refspecs_str[refspecs_list.nr];
> > + const char **refspecs_str;
> > int i;
> >
> > + refspecs_str = xmalloc(sizeof(*refspecs_str) *
> > refspecs_list.nr);
> > for (i = 0; i < refspecs_list.nr; i++)
> > refspecs_str[i] = refspecs_list.items[i].string;
> >
> > @@ -746,6 +747,7 @@ int cmd_fast_export(int argc, const char **argv, const
> > char *prefix)
> > refspecs = parse_fetch_refspec(refspecs_nr, refspecs_str);
> >
> > string_list_clear(&refspecs_list, 1);
> > + free(refspecs_str);
> > }
> >
> > if (use_done_feature)
> > diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh
> > index 716aa4c..1c006a0 100755
> > --- a/git-remote-testgit.sh
> > +++ b/git-remote-testgit.sh
> > @@ -15,6 +15,8 @@ test -z "$refspec" && prefix="refs"
> >
> > export GIT_DIR="$url/.git"
> >
> > +force=
> > +
> > mkdir -p "$dir"
> >
> > if test -z "$GIT_REMOTE_TESTGIT_NO_MARKS"
>
> What about changing those two test-hg.sh tests to test_expect_success?
>
> http://article.gmane.org/gmane.comp.version-control.git/237606
I can do that.
> Should those changes be squashed into the "transport-helper: don't
> update refs in dry-run" and "transport-helper: add 'force' to 'export'
> helpers" commits? Or are those commits not really the appropriate place?
I think it should be a separate commit, since it's not part of the core, but
contrib area.
--
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
