From: Richard Hansen rhan...@bbn.com
Signed-off-by: Richard Hansen rhan...@bbn.com
Acked-by: Felipe Contreras felipe.contre...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-bzr | 31
From: Richard Hansen rhan...@bbn.com
Signed-off-by: Richard Hansen rhan...@bbn.com
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/test-hg.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff
Felipe Contreras (7):
config: avoid yoda conditions
add: avoid yoda conditions
abspath: trivial style fix
t: trivial whitespace cleanups
fetch: add missing documentation
sha1_name: cleanup interpret_branch_name()
sha1_name: simplify track finding
Documentation/git-fetch.txt | 3
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
config.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c
index e1d66a1..7a44414 100644
--- a/config.c
+++ b/config.c
@@ -610,7 +610,7 @@ static int git_config_maybe_bool_text(const char
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
abspath.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abspath.c b/abspath.c
index e390994..8b3385a 100644
--- a/abspath.c
+++ b/abspath.c
@@ -143,7 +143,7 @@ static const char *real_path_internal(const char
There's no mention of the 'origin' default, or the fact that the
upstream tracking branch remote is used.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fetch.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/git-fetch.txt b/Documentation
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t0002-gitfile.sh| 3 +--
t/t0003-attributes.sh | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index cb14425..37e9396 100755
--- a/t/t0002-gitfile.sh
+++ b/t/t0002
://github.com/felipec/git/commit/270e7ff91a4a34e8bc27edb6bd7d7473b886f568
--
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
Richard Hansen wrote:
On 2013-11-11 06:44, Felipe Contreras wrote:
Richard Hansen wrote:
The POSIX spec says that the '-a', '-o', and parentheses operands to
the 'test' utility are obsolete extensions due to the potential for
ambiguity. Replace '-o' with '|| test' to avoid unspecified
see that.
Cheers.
--
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
Richard Hansen wrote:
A handful of fixes for the git-remote-hg and git-remote-bzr remote
helpers and their unit tests.
I'm OK with the whole series.
--
Felipe Contreras
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
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
The remote helper namespace should not be updated.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index b66c7fd..9558a0d 100644
--- a/transport
);
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
So that we can convert the exported ref names.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-export.txt | 4
builtin/fast-export.c | 32
t/t9350-fast-export.sh| 7 +++
3 files changed, 43
By using fast-export's new --refspec option.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 2 +-
transport-helper.c| 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote
We don't want to pass arguments specific to fast-export to
setup_revisions.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 78250ea
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-import.txt | 3 +++
fast-import.c | 13 ++---
t/t9300-fast-import.sh| 18 ++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/Documentation
For remote-helpers that use 'export' to push.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 8
transport-helper.c| 11 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801
So that we can convert the exported ref names.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-export.txt | 4
builtin/fast-export.c | 32
t/t9350-fast-export.sh| 7 +++
3 files changed, 43
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 14 ++
t/t9350-fast-export.sh | 11 +++
2 files changed, 25 insertions(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index cf745ec..4b76222 100644
--- a/builtin/fast
From: Richard Hansen rhan...@bbn.com
Signed-off-by: Richard Hansen rhan...@bbn.com
---
contrib/remote-helpers/test-hg.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-helpers/test-hg.sh
b/contrib/remote-helpers/test-hg.sh
index 72f745d..aacd8a9 100755
By using fast-export's new --refspec option.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 2 +-
transport-helper.c| 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote
For remote-helpers that use 'export' to push.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 8
transport-helper.c| 11 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 14 ++
t/t9350-fast-export.sh | 11 +++
2 files changed, 25 insertions(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index cf745ec..4b76222 100644
--- a/builtin/fast
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-import.txt | 3 +++
fast-import.c | 13 ++---
t/t9300-fast-import.sh| 18 ++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/Documentation
We don't want to pass arguments specific to fast-export to
setup_revisions.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 78250ea
Otherwise they cannot know when to force the push or not (other than
hacks).
Tests-by: Richard Hansen rhan...@bbn.com
Documentation-by: Richard Hansen rhan...@bbn.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/gitremote-helpers.txt | 4
git-remote
So the remote-helpers can tell us when a forced push was needed.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/transport-helper.c b/transport-helper.c
index 60fba99..23af747 100644
do_option(parser):
+global force
+(opt, val) = parser[1:3]
I prefer:
opt, val = parser[1:3]
But not a big deal.
Otherwise the patch looks OK to me.
--
Felipe Contreras
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
Richard Hansen wrote:
On 2013-11-11 18:50, Felipe Contreras wrote:
On Mon, Nov 11, 2013 at 5:25 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
So that we can convert the exported ref names.
Signed-off-by: Felipe Contreras felipe.contre
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Does it?
% git config remote.origin.fetch '+refs/heads/*:refs/remotes-test/origin/*'
% git fetch origin master
From /home/felipec/dev/git
* branchmaster - FETCH_HEAD
* [new branch
Richard Hansen wrote:
The internal mercurial API expects ordinary 8-bit string objects, not
Unicode string objects. With this change, the test-hg.sh unit tests
pass again.
This makes sense to me, but the tests are already passing for me. How are they
failing for you?
--
Felipe Contreras
%/*}/../../t || exit 1
I think this should do the trick:
test -z $TEST_DIRECTORY TEST_DIRECTORY=$(realpath ${0%/*}/../../t)
. $TEST_DIRECTORY/test-lib.sh
--
Felipe Contreras
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
using --verbose.
This doesn't. Run the tests in t/* and you would seen tons and tons of those
warnings, if they should be avoided, they should be avoided for all the tests,
why only these?
I say drop the second part. Yes it's annoying, but we have to deal with it.
--
Felipe Contreras
to
prevent it from affecting code outside the function.
Makes sense.
--
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
theta t...@example.com
+ author_test iota iota test at example dot com iota unknown
+ author_test kappa ka...@example.com Unknown ka...@example.com
)
git clone hg::hgrepo gitrepo
--
Felipe Contreras
--
To unsubscribe from this list: send the line unsubscribe git
Richard Hansen wrote:
Before, strings like foo@example.com would be converted to
foo. b...@example.com when they should be unknown
foo@example.com.
Indeed. Thanks.
--
Felipe Contreras
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord
Richard Hansen wrote:
The POSIX spec says that the '-a', '-o', and parentheses operands to
the 'test' utility are obsolete extensions due to the potential for
ambiguity. Replace '-o' with '|| test' to avoid unspecified behavior.
All right, if you say so.
--
Felipe Contreras
:
if key == 'force':
force = get_bool_option(value)
print 'ok'
else:
print 'unsupported'
except InvalidOptionValue:
print error '%s' is not a valid value for option '%s' % (value,
key)
Cheers.
--
Felipe Contreras
On Mon, Nov 11, 2013 at 12:12 PM, Richard Hansen rhan...@bbn.com wrote:
On 2013-11-11 06:51, Felipe Contreras wrote:
def do_option(parser):
global force
_, key, value = parser.line.split(' ')
I'm surprised you prefer this over 'key, val = parser[1:3]' or even
'_, key, val
On Mon, Nov 11, 2013 at 12:31 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Richard Hansen wrote:
cd to the t/ subdirectory so that the user doesn't already have to be
in the test directory to run these test scripts.
Signed-off-by: Richard
On Mon, Nov 11, 2013 at 12:30 PM, Richard Hansen rhan...@bbn.com wrote:
On 2013-11-11 06:04, Felipe Contreras wrote:
Richard Hansen wrote:
The internal mercurial API expects ordinary 8-bit string objects, not
Unicode string objects. With this change, the test-hg.sh unit tests
pass again
On Mon, Nov 11, 2013 at 1:19 PM, Richard Hansen rhan...@bbn.com wrote:
On 2013-11-11 06:42, Felipe Contreras wrote:
Richard Hansen wrote:
It's hard to tell which author conversion test failed when the email
addresses look similar.
Signed-off-by: Richard Hansen rhan...@bbn.com
---
contrib
)
Actually, why -u? Isn't 'git push bzr master' enough?
--
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
On Mon, Nov 11, 2013 at 3:16 PM, Richard Hansen rhan...@bbn.com wrote:
On 2013-11-11 14:31, Felipe Contreras wrote:
On Sun, Nov 10, 2013 at 10:05 PM, Richard Hansen rhan...@bbn.com wrote:
@@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' '
git add content
git
)
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
Commit 9c51558 (transport-helper: trivial code shuffle) moved these
lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
had a wrong merge conflict and readded them.
Reported-by: Richard Hansen rhan...@bbn.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
So that we can convert the exported ref names.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-export.txt | 4
builtin/fast-export.c | 32
t/t9350-fast-export.sh| 7 +++
3 files changed, 43
We don't want to pass arguments specific to fast-export to
setup_revisions.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 78250ea
For remote-helpers that use 'export' to push.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 8
transport-helper.c| 11 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-import.txt | 3 +++
fast-import.c | 13 ++---
t/t9300-fast-import.sh| 18 ++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/Documentation
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 14 ++
t/t9350-fast-export.sh | 11 +++
2 files changed, 25 insertions(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index cf745ec..4b76222 100644
--- a/builtin/fast
Otherwise they cannot know when to force the push or not (other than
hacks).
Tests-by: Richard Hansen rhan...@bbn.com
Documentation-by: Richard Hansen rhan...@bbn.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/gitremote-helpers.txt | 4
git-remote
The remote helper namespace should not be updated.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index b66c7fd..9558a0d 100644
--- a/transport
By using fast-export's new --refspec option.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 2 +-
transport-helper.c| 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote
On Mon, Nov 11, 2013 at 5:33 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Here are the patches that allow transport helpers to be completely
transparent;
renaming branches, deleting them, custom refspecs, --force, --dry-run,
reporting
On Mon, Nov 11, 2013 at 5:28 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Otherwise they cannot know when to force the push or not (other than
hacks).
Tests-by: Richard Hansen rhan...@bbn.com
Documentation-by: Richard Hansen rhan...@bbn.com
On Mon, Nov 11, 2013 at 5:25 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
So that we can convert the exported ref names.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
I thought that the discussion agreed this option should
On Sun, Nov 10, 2013 at 4:46 PM, Richard Hansen rhan...@bbn.com wrote:
On 2013-10-29 04:41, Felipe Contreras wrote:
Richard Hansen wrote:
Signed-off-by: Richard Hansen rhan...@bbn.com
---
git-remote-testgit.sh | 18 ++
1 file changed, 18 insertions(+)
diff --git a/git
On Wed, Nov 6, 2013 at 3:00 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
On Thu, Oct 31, 2013 at 12:26 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
+test_expect_success 'use refspec
On Sat, Nov 2, 2013 at 5:00 AM, John Keeping j...@keeping.me.uk wrote:
On Fri, Nov 01, 2013 at 06:35:39AM -0600, Felipe Contreras wrote:
One feature that is missing from git-integration is the ability to
parse existing integration branches.
Nice - I'd never thought of doing this.
I tried
On Fri, Nov 1, 2013 at 5:05 AM, SZEDER Gábor sze...@ira.uka.de wrote:
On Thu, Oct 31, 2013 at 09:50:51PM -0600, Felipe Contreras wrote:
On Thu, Oct 31, 2013 at 8:48 PM, David Aguilar dav...@gmail.com wrote:
On Thu, Oct 31, 2013 at 07:56:03PM -0600, Felipe Contreras wrote:
Nobody is forcing
--continue`.
Despite having more features, the code is actually smaller thanks to
Ruby awesomeness.
Enjoy.
https://github.com/felipec/git-reintegrate
--
Felipe Contreras
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
On Fri, Nov 1, 2013 at 8:49 AM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
Felipe Contreras felipe.contre...@gmail.com writes:
On Thu, Oct 31, 2013 at 12:21 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes
No functional changes.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/merge.c | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 02a69c1..41fb66d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
Most of these have been sent before, but were not applied for one reason or
another.
Felipe Contreras (16):
merge: simplify ff-only option
t: replace pulls with merges
pull: cleanup documentation
fetch: add missing documentation
revision: add missing include
shortlog: add missing
This is what the code intended.
No functional changes.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/annotate-tests.sh| 2 +-
t/t4200-rerere.sh | 2 +-
t/t9114-git-svn-dcommit-merge.sh | 2 +-
t/t9500-gitweb-standalone
Otherwise we would have to include commit.h.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
shortlog.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/shortlog.h b/shortlog.h
index de4f86f..54bc07c 100644
--- a/shortlog.h
+++ b/shortlog.h
@@ -19,6 +19,8 @@ struct shortlog
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
setup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.c b/setup.c
index dbf4138..5432a31 100644
--- a/setup.c
+++ b/setup.c
@@ -563,7 +563,7 @@ static const char *setup_git_directory_gently_1(int
Otherwise we might not have 'struct diff_options'.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
revision.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/revision.h b/revision.h
index e7f1d21..89132df 100644
--- a/revision.h
+++ b/revision.h
@@ -5,6 +5,7 @@
#include
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/transport-helper.c b/transport-helper.c
index b32e2d6..673b7c2 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -269,6 +269,7 @@ static const char
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/add.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/add.c b/builtin/add.c
index 226f758..9b30356 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -429,7 +429,7 @@ int cmd_add(int argc, const char
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
revision.c | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/revision.c b/revision.c
index 3fdea51..956040c 100644
--- a/revision.c
+++ b/revision.c
@@ -1519,7 +1519,7 @@ struct cmdline_pathspec
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
run-command.c | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/run-command.c b/run-command.c
index 1b7f88e..3914d9c 100644
--- a/run-command.c
+++ b/run-command.c
@@ -406,13 +406,12 @@ fail_pipe
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
pretty.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pretty.c b/pretty.c
index b4e32b7..962e82b 100644
--- a/pretty.c
+++ b/pretty.c
@@ -497,7 +497,7 @@ void pp_user_info(struct pretty_print_context *pp
'origin/master' is very clear, no need to specify the 'remotes/' prefix,
or babysit the user.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-pull.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-pull.txt b
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/diff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/diff.c b/builtin/diff.c
index 2fb8c5d..adb93a9 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -169,7 +169,7 @@ static int
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sha1_name.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sha1_name.c b/sha1_name.c
index 0e5fe7f..e9c2999 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -343,7 +343,6 @@ static int get_short_sha1(const char *name, int len
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/describe.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/builtin/describe.c b/builtin/describe.c
index b9d3603..6f62109 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -9,7 +9,7
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/branch.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index ad0f86d..5696cf0 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -975,9 +975,8 @@ int cmd_branch
After every test the environment should be as close as to how it was
before as possible.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t3200-branch.sh | 71 +++
1 file changed, 35 insertions(+), 36 deletions(-)
diff --git
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 14 ++
t/t9350-fast-export.sh | 11 +++
2 files changed, 25 insertions(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index b6f623e..8ed41b4 100644
--- a/builtin/fast
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-import.txt | 3 +++
fast-import.c | 13 ++---
t/t9300-fast-import.sh| 18 ++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/Documentation
We don't want to pass arguments specific to fast-export to
setup_revisions.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 78250ea
So that we can convert the exported ref names.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-export.txt | 4
builtin/fast-export.c | 30 ++
t/t9350-fast-export.sh| 7 +++
3 files changed, 41
Otherwise they cannot know when to force the push or not (other than
hacks).
Tests-by: Richard Hansen rhan...@bbn.com
Documentation-by: Richard Hansen rhan...@bbn.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/gitremote-helpers.txt | 4
git-remote
The remote helper namespace should not be updated.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index 985eeea..d05fc7c 100644
--- a/transport
Commit 9c51558 (transport-helper: trivial code shuffle) moved these
lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
had a wrong merge conflict and readded them.
Reported-by: Richard Hansen rhan...@bbn.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
By using fast-export's new --refspec option.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 2 +-
transport-helper.c| 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote
So the remote-helpers can tell us when a forced push was needed.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/transport-helper.c b/transport-helper.c
index ed238e5..5aba15c 100644
testgit::${PWD}/server local2 2error
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
For remote-helpers that use 'export' to push.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 8
transport-helper.c| 11 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801
to be
rerolled before advancing to 'next'.
The suggestions are applied, as you can see in the diff.
--
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
On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -39,7 +39,7 @@ Assume the following history exists and the current branch
is
`master
On Thu, Oct 31, 2013 at 12:32 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 0fe7647..33673e0 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -329,7 +329,7
On Thu, Oct 31, 2013 at 12:26 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
+test_expect_success 'use refspec' '
+ git fast-export --refspec refs/heads/master:refs/heads/foobar master |
\
+ grep ^commit | sort | uniq actual
On Thu, Oct 31, 2013 at 12:21 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Otherwise they cannot know when to force the push or not (other than
hacks).
...
diff --git a/transport-helper.c b/transport-helper.c
index d05fc7c..ed238e5 100644
On Thu, Oct 31, 2013 at 12:50 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
On Thu, Oct 31, 2013 at 12:32 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
diff --git a/t/t3200-branch.sh b/t/t3200
On Thu, Oct 31, 2013 at 12:10 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index e08a028..7e75dc4 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git
601 - 700 of 3053 matches
Mail list logo
