Charles Bailey wrote:
> On Tue, Apr 22, 2014 at 01:53:46AM -0500, Felipe Contreras wrote:
> > Charles Bailey wrote:
> > > On Tue, Apr 22, 2014 at 01:24:09AM -0500, Felipe Contreras wrote:
> > > >
> > > > This is what I get when a tool is not working:
&
Ilya Bobyr wrote:
> On 4/21/2014 11:45 PM, Felipe Contreras wrote:
> > [...]
> >>>> This is how it is suggested by t/README and how it is done in the other
> >>>> test suites.
> >>>> I can not see how your case is different, but I might be mis
Charles Bailey wrote:
> On Tue, Apr 22, 2014 at 01:24:09AM -0500, Felipe Contreras wrote:
> >
> > This is what I get when a tool is not working:
> >
> > Documentation/config.txt seems unchanged.
> > Was the merge successful? [y/n]
>
> Does this happen
Ilya Bobyr wrote:
> On 4/21/2014 3:24 PM, Felipe Contreras wrote:
> > Ilya Bobyr wrote:
> >> On Mon, Apr 21, 2014 at 2:35 PM, Felipe Contreras <
> >> felipe.contre...@gmail.com> wrote:
> >>> Ilya Bobyr wrote:
> >>>> test_expect_success &#
Charles Bailey wrote:
> On Mon, Apr 21, 2014 at 09:59:52PM -0700, David Aguilar wrote:
> > [Cc:ing Charles in case he has an opinion, this behavior dates back to the
> > original MT]
> >
> > On Sun, Apr 20, 2014 at 07:17:34PM -0500, Felipe Contreras wrote:
> >
David Aguilar wrote:
> On Sun, Apr 20, 2014 at 05:41:05PM -0500, Felipe Contreras wrote:
> > = Reject non-fast-forward pulls by default =
> >
> > Many new-comers end up making merges by mistake when they pull because
> > they don't understand what is a non-f
izmo.com/s3/1587798/osocas-2014
>
> Sorry for the inconvenience(s)!
I already filled the survey in the first URL, will that work?
--
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
and it fails,
> it drives me crazy, but there's just no sane defaults.
Yes there are sane defaults.
co = checkout
ci = commit
rb = rebase
st = status
br = branch
dt = difftool
mt = mergetool
--
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
7;m doing something wrong -- Johannes says
> building
> mingw64 Git is dirt-easy.
I get the same error. I've been cross-compiling since basically all my
professional life, so I don't think you are doing something wrong, it just
doesn't work.
--
Felipe Contreras
--
To unsu
Junio C Hamano wrote:
> Ilya Bobyr writes:
>
> > On 4/21/2014 2:17 PM, Felipe Contreras wrote:
> >> Ilya Bobyr wrote:
> >>
> >>> Also, most have names that start with either "pre-" or "post-".
> >>> It seems reasonable fo
Ilya Bobyr wrote:
> On Mon, Apr 21, 2014 at 2:35 PM, Felipe Contreras <
> felipe.contre...@gmail.com> wrote:
> > Ilya Bobyr wrote:
> > > test_expect_success 'setup' "
> > > mkdir -p .git/hooks &&
> > > cat > .git
Ilya Bobyr wrote:
> On 4/21/2014 2:17 PM, Felipe Contreras wrote:
> > Ilya Bobyr wrote:
> >
> >> Also, most have names that start with either "pre-" or "post-".
> >> It seems reasonable for both "pre-update-branch" and
> >> &
Ilya Bobyr wrote:
> On 4/21/2014 2:15 PM, Felipe Contreras wrote:
> > Ilya Bobyr wrote:
> >> On 4/20/2014 7:23 PM, Felipe Contreras wrote:
> >>> [...]
> >>>
> >>> diff --git a/t/t5408-update-branch-hook.sh b/t/t5408-update-branch-hook.sh
&
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > contrib/remote-helpers/test-bzr.sh | 2 +-
> > contrib/remote-helpers/test-hg-bidi.sh | 2 +-
> > contrib/remote-helpers/test-hg-hg-git.sh | 4 ++--
>
e "pre-update-branch", I guess.
>
> I was also wondering about "git reset". It could also change the branch
> position, right?
That's right, maybe that command should call the hook as well.
--
Felipe Contreras
--
To unsubscribe from this list: send the line &qu
Ilya Bobyr wrote:
> On 4/20/2014 7:23 PM, Felipe Contreras wrote:
> > [...]
> >
> > diff --git a/t/t5408-update-branch-hook.sh b/t/t5408-update-branch-hook.sh
> > new file mode 100755
> > index 000..d921c0e
> > --- /dev/null
> > +++ b/t/
Ilya Bobyr wrote:
> On 4/20/2014 7:23 PM, Felipe Contreras wrote:
> > This hook is invoked whenever a branch is updated, either when a branch
> > is created or updated with 'git branch', or when it's rebased with 'git
> > rebase'. It receives two param
Theodore Ts'o wrote:
> On Mon, Apr 21, 2014 at 09:47:57PM +0200, Sebastian Schuberth wrote:
> > On Mon, Apr 21, 2014 at 9:34 PM, Felipe Contreras
> > wrote:
> >
> > > I have these aliases as well, except br => b, and cp => pi. 'br' is
> >
ocals, fromlist, level)
ImportError: No module named bzrlib
test-bzr.sh .. skipped: skipping remote-bzr tests; bzr not available
Files=1, Tests=0, 0 wallclock secs ( 0.03 usr 0.00 sys + 0.02 ...
Squelch that output.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/test-b
The remote-helpers in contrib/remote-helpers have proved to work, be
reliable, and stable. It's time to move them out of contrib, and be
distributed by default.
Signed-off-by: Felipe Contreras
---
.gitignore | 2 ++
Mak
They should be tested by default.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/Makefile| 14 --
contrib/remote-helpers/test-hg.sh => t/t5810-remote-hg.sh | 3 +--
.../test-hg-bidi.sh => t/t5811-remote-hg-bidi.sh
There doesn't seem to be any reason to keep these remote-helpers in the contrib
area.
Felipe Contreras (3):
remote-helpers: squelch python import exceptions
remote-helpers: move out of contrib
remote-helpers: move tests out of contrib
.giti
Sebastian Schuberth wrote:
> On 21.04.2014 00:41, Felipe Contreras wrote:
>
> > = Default aliases =
> >
> > Every single version control tool out there has default aliases (e.g.
> > co = checkout) except Git.
> >
> > Every argument against default aliases
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> >> This step needs a bit more work, I am afraid, to at least have these
> >> three test scripts follow the same numbering scheme. Especially given
> >> that there were recent discussions on allowing a range of
ly I shouldn't be able to build upstream Git
for Windows with mingw without leaving my Linux system.
--
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
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > They should be tested by default.
> >
> > Signed-off-by: Felipe Contreras
> > ---
> > contrib/remote-helpers/Makefile| 14
> > --
> > t/Makefile
ase commit the
branch was rebased onto, a third parameter contains it.
It can be used to verify the validity of branch names, and also to keep
track of the origin point of a branch, which is otherwise not possible
to find out [1].
[1] http://thread.gmane.org/gmane.comp.version-control.git/1985
It's similar to the default, except that the other windows are hidden.
This ensures that removed/added colors are still visible on the main
merge window, but the other windows not visible.
Specially useful with merge.conflictstyle=diff3.
Signed-off-by: Felipe Contreras
---
How a conflict
I don't see why people need to set these to have sensible behavior:
merge.defaulttoupstream = true
mergetool.prompt = false
Let's change them to sane defaults so they are not needed.
Felipe Contreras (2):
merge: enable defaulttoupstream by default
mergetool: run prompt only
There's no point in this:
% git merge
fatal: No commit specified and merge.defaultToUpstream not set.
We know the most likely scenario is that the user wants to merge the
upstream, and if not, he can set merge.defaultToUpstream to false.
Signed-off-by: Felipe Contreras
---
Documentatio
It's annoying to see the prompt:
Hit return to start merge resolution tool (foo):
Every time the user does 'git mergetool' even if the user already
configured 'foo' as the wanted tool.
Display this prompt only when the user hasn't explicitly configured a
tool.
S
On Sun, Apr 20, 2014 at 5:41 PM, Felipe Contreras
wrote:
> [3] http://thread.gmane.org/gmane.comp.version-control.git/240030
> [4] http://thread.gmane.org/gmane.comp.version-control.git/235981
Actually:
[3] http://thread.gmane.org/gmane.comp.version-control.git/233554
[4
ol.git/233295
[6] http://thread.gmane.org/gmane.comp.version-control.git/197111
[7] http://thread.gmane.org/gmane.comp.version-control.git/166675
[8] http://thread.gmane.org/gmane.comp.version-control.git/115666
[9] http://thread.gmane.org/gmane.comp.version-control.git/235145
--
Felipe Contreras
--
To un
e were "not the matter for your liking or not
liking", and now you are explaining why you like one better than the other.
I don't think it's particularly helpful to criticize one person's preferences
because they don't match yours.
You like one, I like another. That'
They should be tested by default.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/Makefile| 14 --
t/Makefile | 8 +++-
.../remote-helpers/test-bzr.sh => t/remote-helpers/bzr.t |
The remote-helpers in contrib/remote-helpers have proved to work, be
reliable, and stable. It's time to move them out of contrib, and be
distributed by default.
Signed-off-by: Felipe Contreras
---
.gitignore | 2 ++
Mak
There doesn't seem to be any reason to keep these remote-helpers in the contrib
area.
Felipe Contreras (2):
remote-helpers: move out of contrib
remote-helpers: move tests out of contrib
.gitignore | 2 ++
Mak
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Junio C Hamano wrote:
> >> As I have said in the recent What's cooking reports, the original
> >> posted here were based on older codebase and needed to be rebased,
> >> but it had some con
system 90% cpu 0.014 total
After:
git branch -v 1.67s user 0.03s system 99% cpu 1.698 total
Signed-off-by: Felipe Contreras
---
builtin/branch.c | 76 +---
t/t6040-tracking-info.sh | 12
2 files changed, 39 insertions(+), 49
7fe1cf80d5196be382ebbbcb1a24c05e61658
If Junio wants to take that he can add my s-o-b.
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
Delcypher wrote:
> > What version of Mercurial are you using?
>
> $ hg --version
>
> Mercurial Distributed SCM (version 2.9.2)
Same as me. And which version of git-remote-hg are you using?
--
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscrib
To setup publish tracking branch, like 'git branch --set-publish'.
Signed-off-by: Felipe Contreras
---
Documentation/git-push.txt | 9 +-
builtin/push.c | 2 ++
t/t5534-push-publish.sh| 70 ++
transport.c
Signed-off-by: Felipe Contreras
---
Documentation/git-branch.txt | 11 +++
branch.c | 44 +
branch.h | 2 ++
builtin/branch.c | 57 ++---
t/t3200-branch.sh| 76
It does it along the upstream branch, if any.
* publish ... [master, gh/publish: ahead 1] ...
master ... [master, gh/master] ...
Signed-off-by: Felipe Contreras
---
builtin/branch.c | 17 -
t/t6040-tracking-info.sh | 5 +++--
2 files changed, 19 insertions(+), 3
The 'upstream' variable doesn't hold an "upstream", but a branch, so
make it clearer.
Signed-off-by: Felipe Contreras
---
sha1_name.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 6fca
It's more efficient to check for the braces first.
Signed-off-by: Felipe Contreras
---
sha1_name.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 906f09d..aa3f3e0 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -417,7 +
Signed-off-by: Felipe Contreras
---
Documentation/revisions.txt | 4
sha1_name.c | 49 -
t/t1508-at-combinations.sh | 5 +
3 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/Documentation/revisions.txt b
publish branch is:
branch.$name.pushremote
branch.$name.push
Signed-off-by: Felipe Contreras
---
Documentation/config.txt | 7 +++
builtin/push.c | 9 -
remote.c | 34 --
remote.h | 4
t/t5516-fetch
amp;&
git push &&
check_push_result up_repo $the_first_commit heads/master &&
check_push_result down_repo $the_commit heads/for-john
'
test_expect_success 'push with publish branch with manual refspec' '
- mk_test up_repo he
We shouldn't modify the commits; it screws the following tests.
Signed-off-by: Felipe Contreras
---
t/t5516-fetch-push.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 67e0ab3..f4cf0db 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/
[1] http://article.gmane.org/gmane.comp.version-control.git/246558
--
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
Signed-off-by: Felipe Contreras
---
transport-helper.c | 4
1 file changed, 4 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index 36fbf93..a90094d 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -876,8 +876,6 @@ static int push_refs_with_export(struct
Signed-off-by: Felipe Contreras
Signed-off-by: Junio C Hamano
---
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 ad9c17e..ef44816 100644
--- a/builtin/fast
By using fast-export's new --refspec option.
Signed-off-by: Felipe Contreras
Signed-off-by: Junio C Hamano
---
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/
Signed-off-by: Felipe Contreras
Signed-off-by: Junio C Hamano
---
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
For remote-helpers that use 'export' to push.
Signed-off-by: Felipe Contreras
Signed-off-by: Junio C Hamano
---
t/t5801-remote-helpers.sh | 8
transport-helper.c| 24 +---
2 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/t/t5
For example 'HEAD'.
Signed-off-by: Felipe Contreras
---
t/t5801-remote-helpers.sh | 8
transport-helper.c| 11 ++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 52b3c99..8288669 1007
ently Git v2.0 is already advertising this feature, but it's missing the
actual patches.
Felipe Contreras (8):
fast-export: improve argument parsing
fast-export: add new --refspec option
transport-helper: add support for old:new refspec
transport-helper: add support to push symbolic r
We don't want to pass arguments specific to fast-export to
setup_revisions.
Signed-off-by: Felipe Contreras
Signed-off-by: Junio C Hamano
---
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 b8
So that we can convert the exported ref names.
Signed-off-by: Felipe Contreras
Signed-off-by: Junio C Hamano
---
Documentation/git-fast-export.txt | 4
builtin/fast-export.c | 32
t/t9350-fast-export.sh| 7 +++
3 files changed
Commit 512477b (tests: use "env" to run commands with temporary env-var
settings) missed some variables in the remote-helpers test. Also
standardize these.
Signed-off-by: Felipe Contreras
---
t/t5801-remote-helpers.sh | 15 +++
1 file changed, 7 insertions(+), 8 deletion
it checkout -b crash master &&
- echo crash >> file &&
+ echo crash >>file &&
git commit -a -m crash &&
test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all &&
cmp_marks origin
I don't like it, but it's 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
Delcypher wrote:
> > What is the problem you are trying to solve?
> The problem I was trying to solve is I wanted my authentication
> details to be in a hgrc local to the repository.
>
> The problem is git-remote-hg will parse
> ``.git/hg/origin/clone/.hg/hgrc`` but will ignore any settings in it
ly matter.
A logo is not a bikeshed, the color does matter. I challenge you to tell a
bride that the she is bikeshedding while choosing the color of the dresses for
her bridemaids.
Sometimes color does matter.
--
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe git
the resulting patch wouldn't get
the same road-blockers as the old one did; namely being held to higher
standards than the current code.
I say it's more important to fix the real issues real people have than hold on
to arbitrary standards which might force the bug to remain present fo
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
Jeff King wrote:
> On Sat, Apr 12, 2014 at 10:05:15AM -0500, Felipe Contreras wrote:
>
> > As you can see; some branches are published, others are not. The ones that
> > are
> > not published don't have a @{publish}, and `git branch -v` doesn't show
> >
es when
> interacting with a remote hg repository?
My recommendation is to avoid them (I don't see the point of them), but they
should work.
--
Felipe Contreras--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
Andrey Borzenkov wrote:
> В Sat, 11 May 2013 08:57:14 -0500
> Felipe Contreras пишет:
>
> > On Sat, May 11, 2013 at 7:29 AM, Andrey Borzenkov
> > wrote:
> > > I noticed that using git-remote-bzr, but as far as I can tell this is
> > > generic for
Felipe Contreras wrote:
> On Sat, May 11, 2013 at 7:29 AM, Andrey Borzenkov wrote:
> > I noticed that using git-remote-bzr, but as far as I can tell this is
> > generic for all transport helpers using fast-export.
> >
> >
> >
> > What happened was "gi
] https://gist.github.com/felipec/10551806
--
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
d-off-by: Felipe Contreras
---
t/t5801-remote-helpers.sh | 17 -
transport-helper.c| 13 +++--
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 613f69a..cf7fd43 100755
--- a/t/t5801-r
It's simpler to store the file names directly, and form the fast-export
arguments only when needed, and re-use the same strbuf with a format.
Signed-off-by: Felipe Contreras
---
transport-helper.c | 23 +++
1 file changed, 11 insertions(+), 12 deletions(-)
diff --
It's cleaner, and will allow us to do something sensible on errors
later.
Signed-off-by: Felipe Contreras
---
transport-helper.c | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index 1432a6d..b068ea5 100644
Instead of exiting directly, make it the duty of the caller to do so.
Signed-off-by: Felipe Contreras
---
transport-helper.c | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index bf329fd..1432a6d 100644
--- a
.gmane.org/gmane.comp.version-control.git/241707
[3] https://github.com/felipec/git/issues/56
Felipe Contreras (5):
transport-helper: remove barely used xchgline()
remote-helpers: make recvline return an error
transport-helper: propagate recvline() error pushing
transport-helper: trivial cleanup
It's only used once, we can just call the two functions inside directly.
Signed-off-by: Felipe Contreras
---
transport-helper.c | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index ad72fbd..bf329fd 100644
--- a/tran
So the remote-helpers can tell us when a forced push was needed.
Helped-by: Max Horn
Signed-off-by: Felipe Contreras
Signed-off-by: Junio C Hamano
---
transport-helper.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/transport-helper.c b/transport-helper.c
index
The remote helper namespace should not be updated.
Signed-off-by: Felipe Contreras
Signed-off-by: Junio C Hamano
---
transport-helper.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index ea34d0c..4b3e38e 100644
--- a
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
Signed-off-by: Felipe Contreras
Signed-off-by: Junio C Hamano
---
tus;
- (*ref)->forced_update = forced;
+ (*ref)->forced_update |= forced;
(*ref)->remote_status = msg;
return !(status == REF_STATUS_OK);
}
Felipe Contreras (4):
transport-helper: mismerge fix
transport-helper: don't update refs in dry-run
transport-helpe
Otherwise they cannot know when to force the push or not (other than
hacks).
Tests-by: Richard Hansen
Documentation-by: Richard Hansen
Signed-off-by: Felipe Contreras
Signed-off-by: Junio C Hamano
---
Documentation/gitremote-helpers.txt | 4
git-remote-testgit.sh | 18
From: Richard Hansen
Signed-off-by: Richard Hansen
Signed-off-by: Junio C Hamano
Signed-off-by: Felipe Contreras
---
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
From: Richard Hansen
Signed-off-by: Richard Hansen
Acked-by: Felipe Contreras
Signed-off-by: Junio C Hamano
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-bzr | 31 ++-
contrib/remote-helpers/test-bzr.sh| 22 +-
2
try:
> -peer = hg.peer(myui, {}, url)
> +peer = hg.peer(repo._unfilteredrepo.ui, {}, url)
Why not repo.unfiltered.ui? Or just repo.ui.
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
.
Notice that 'gh/fc/master' is the publish branch, there is no upstream.
* pu [] Merge branch 'travis-ci' into pu
Similar to Junio's pu, I use `git reintegrate` to generate this branch using
'master' as the baseline, and merging all the fc/* branches.
Jeff King wrote:
> On Fri, Apr 11, 2014 at 08:48:01AM -0500, Felipe Contreras wrote:
>
> > I think of @{publish} as "the branch the user has configured to push
> > to"; it overrides all other configurations (push.default and push
> > refspecs). I wouldn't
Jeff King wrote:
> On Fri, Apr 11, 2014 at 08:24:48AM -0500, Felipe Contreras wrote:
>
> > I would actually like you (everyone) to be honest and answer this
> > question;
> >
> > Have you actually analized the logo? Or are you just arguing against
> > change,
le is
readable before calling "read".
Signed-off-by: Felipe Contreras
---
contrib/completion/git-prompt.sh | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 7b732d2..1526086
to have some interactions to break tests when merged to 'pu'.
That was v2, wasn't it?
[1] http://article.gmane.org/gmane.comp.version-control.git/246157
--
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
So that the committer is reset properly.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/test-bzr.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/test-bzr.sh
b/contrib/remote-helpers/test-bzr.sh
index 1e53ff9..f5c90a4 100755
--- a
Max Horn wrote:
> On 11.04.2014, at 20:56, Felipe Contreras wrote:
> > Max Horn wrote:
> >> Come back when you have facts, as opposed to the illusion that you are the
> >> spokesperson of the (apparently silent) majority of Git users.
> >
> > Facts:
es/foo/*
[branch "master"]
pushremote = foo
push = refs/heads/bar
> I personally think that kind of override adds any more values than
> it causes confusion, so I think it is OK not to support such uses of
> branch.*.push at all. A configu
Matthieu Moy wrote:
> Felipe Contreras writes:
>
> > My patch series only affects push.default=simple, perhaps you have a
> > different configuration.
>
> Good catch. I have push.default=upstream (essentially for compatibility
> with old Git versions, I'd prefe
Max Horn wrote:
> On 11.04.2014, at 17:21, Felipe Contreras wrote:
> > Max Horn wrote:
> >> On 11.04.2014, at 15:29, Felipe Contreras
> >> wrote:
> >>> Max Horn wrote:
> >>>
> >>> You don't think red represent an oldness in
The 'upstream' variable doesn't hold an "upstream", but a branch, so
make it clearer.
Signed-off-by: Felipe Contreras
---
sha1_name.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 6fca
It does it along the upstream branch, if any.
* publish ... [master, gh/publish: ahead 1] ...
master ... [master, gh/master] ...
Signed-off-by: Felipe Contreras
---
builtin/branch.c | 17 -
t/t6040-tracking-info.sh | 5 +++--
2 files changed, 19 insertions(+), 3
Signed-off-by: Felipe Contreras
---
Documentation/git-branch.txt | 11 +++
branch.c | 44 +
branch.h | 2 ++
builtin/branch.c | 57 ++---
t/t3200-branch.sh| 76
Signed-off-by: Felipe Contreras
---
Documentation/revisions.txt | 4
sha1_name.c | 49 -
t/t1508-at-combinations.sh | 5 +
3 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/Documentation/revisions.txt b
It's more efficient to check for the braces first.
Signed-off-by: Felipe Contreras
---
sha1_name.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 906f09d..aa3f3e0 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -417,7 +
501 - 600 of 3330 matches
Mail list logo
