Felipe Contreras felipe.contre...@gmail.com writes:
Junio C Hamano wrote:
* fc/complete-aliased-push (2014-04-09) 1 commit
- completion: fix completing args of aliased push, fetch, etc.
Will merge to 'next'.
* fc/remote-helper-fixes (2014-04-09) 4 commits
- remote-bzr: include
Junio C Hamano gits...@pobox.com writes:
What is the race under discussion about? It is about the index,
which corresponds one-to-one to the working tree, so in order for
the race to matter, you need to be racing against another process
that is not cooperating with you (e.g. a continuous and
On Sat, Apr 12, 2014 at 11:19 AM, Junio C Hamano gits...@pobox.com wrote:
Duy Nguyen pclo...@gmail.com writes:
On Sat, Apr 12, 2014 at 3:43 AM, Junio C Hamano gits...@pobox.com wrote:
Having said that, nobody sane would be running two simultaneous
operations that are clearly write-oriented
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 mind having a @{push} *in addition* to @{publish}
that would have the
Am 11.04.2014 um 22:38 schrieb Torsten Bögershausen tbo...@web.de:
On 2014-04-11 22.20, Frank Ammeter wrote:
I’m not a git expert and this might be the wrong place to ask this question,
so please send me somewhere else if I’m in the wrong place.
I asked the same question on stack overflow,
On Fri, Apr 11, 2014 at 12:24:35PM -0700, Junio C Hamano wrote:
But the branch.master.push setting does not do
anything to git push.
I am not sure I understand this. I thought that the desire behind
the branch.*.push is to allow something like:
... other things in the config ...
On Fri, Apr 11, 2014 at 12:25:17PM -0700, Junio C Hamano wrote:
The mention of dev.git-scm.com gives me a mixed feeling. The
chasm between the developer community and casual end-users who know
about Git primarily via their perusal of git-scm.com is one of the
root causes of this confusion.
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, because the logo is already used by git-scm.com, and related
stuff?
Is
Is it me or is the only way to clear a single invalid password out of the
credential-cache is by git credential-cache exit?
-Jason
--
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
- -
- Jason Pyeron
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, because the logo is already used by git-scm.com,
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 mind having a @{push} *in addition* to @{publish}
Jeff King wrote:
On Fri, Apr 11, 2014 at 12:24:35PM -0700, Junio C Hamano wrote:
But the branch.master.push setting does not do
anything to git push.
I am not sure I understand this. I thought that the desire behind
the branch.*.push is to allow something like:
... other
Kyle J. McKay mack...@gmail.com writes:
On Apr 11, 2014, at 10:30, Matthieu Moy wrote:
Kyle J. McKay mack...@gmail.com writes:
There are already nested functions with file inclusion between both
levels of nesting in git-rebase--interactive.sh and git-rebase--
merge.sh now, so it's not
On 11/04/14 23:22, Junio C Hamano wrote:
[...]
[New Topics]
* nd/index-pack-one-fd-per-thread (2014-04-09) 1 commit
- index-pack: work around thread-unsafe pread()
Enable threaded index-pack on platforms without thread-unsafe
pread() emulation.
Will merge to 'next' and keep it
From: Junio C Hamano gits...@pobox.com
So far I've mostly been ignoring how the command line would look
like,
I don't really feel this way ;-)
because the intermediate goal to my mind was to have it as a
hook that are added by people better versed with Git than an average
end-user, and if
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
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Hi,
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;
-
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
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
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
The remote helper namespace should not be updated.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
transport-helper.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/transport-helper.c
So the remote-helpers can tell us when a forced push was needed.
Helped-by: Max Horn m...@quendi.de
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
transport-helper.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com
---
I'll queue this fix as part of the German l10n changes
for the next release.
po/de.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/de.po b/po/de.po
index 773ae87..3e01e72 100644
--- a/po/de.po
+++ b/po/de.po
@@
One of the most serious recurring issues[1][2][3] with remote helpers is that
marks get out of sync. The way to analize and reproduce these wasn't trivial,
but the culprit seems to be a crash while doing `git push`. It has been known
already how exactly that happens, but no simple way how to fix
It's only used once, we can just call the two functions inside directly.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index ad72fbd..bf329fd
Instead of exiting directly, make it the duty of the caller to do so.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index
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 felipe.contre...@gmail.com
---
transport-helper.c | 23 +++
1 file changed, 11 insertions(+), 12
It's cleaner, and will allow us to do something sensible on errors
later.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index
When a remote helper crashes while pushing we should revert back to the
state before the push, however, it's possible that `git fast-export`
already finished its job, and therefore has exported the marks already.
This creates a synchronization problem because from that moment on
`git
Rüdiger Sonderfeld wrote:
I'm using git-remote-bzr to access the GNU Emacs Bazaar repo. I followed the
guideline described here:
https://lists.gnu.org/archive/html/emacs-devel/2013-05/msg8.html
Pulling and pushing worked flawless for several month. But recently git
bzr stopped
Felipe Contreras wrote:
On Sat, May 11, 2013 at 7:29 AM, Andrey Borzenkov arvidj...@gmail.com 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 git push failed due to merge conflict. So
Andrey Borzenkov wrote:
В Sat, 11 May 2013 08:57:14 -0500
Felipe Contreras felipe.contre...@gmail.com пишет:
On Sat, May 11, 2013 at 7:29 AM, Andrey Borzenkov arvidj...@gmail.com
wrote:
I noticed that using git-remote-bzr, but as far as I can tell this is
generic for all transport
Am 11.04.2014 21:23, schrieb Junio C Hamano:
Jeff King p...@peff.net writes:
On Fri, Apr 11, 2014 at 01:24:02AM -0700, Kyle J. McKay wrote:
Since 11502468 and 04c1ee57 (both first appearing in v1.8.5), the
t7001-mv test has used cp -a to perform a copy in several of the
tests.
However,
Christophe wrote:
I am using git-remote-hg to access to projects on bitbucket. I can clone the
master branch fine and push to it. I also see hg branches as
remotes/origin/branches/«branch». However, if I create a local branch
branches/x and want to push it to remotes/origin/branches/x, it
On 8. 4. 2014 20:43, Jens Lehmann wrote:
Useful when values for commit are 'all' (default) or 'none'. The others
('dirty' and 'untracked') have same effect as 'none', as commit is only
interested in whether the submodule's HEAD differs from what is commited
in the superproject.
Unless it
Inline comment had incorrect grammar. Fix grammatical mistakes and
reflect actual behavior of the function.
Signed-off-by: Brian Gesiak modoca...@gmail.com
---
builtin/checkout.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index
Allow ignoring submodules (or not) by command line switch, like diff
and status do.
Git add currently doesn't honor ignore from .gitmodules or .git/config,
which is related functionality, however I'd like to change that in
another patch, coming soon.
This commit is also a prerequisite for the
Allow ignoring submodules (or not) by command line switch, like diff
and status do.
Git commit honors the 'ignore' setting from .gitmodules or .git/config,
but didn't allow to override it from command line.
This patch depends on Jens Lehmann's patch commit -m: commit staged
submodules regardless
Signed-off-by: Dave Borowitz dborow...@google.com
---
Makefile | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index d6330bc..3c151d3 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,9 @@ all::
# Define CURL_CONFIG to the path to a curl-config
curl-config should always be installed alongside a curl distribution,
and its purpose is to provide flags for building against libcurl, so
use it instead of guessing flags and dependent libraries.
Allow overriding CURL_CONFIG to a custom path to curl-config, to
compile against a curl installation
On 8. 4. 2014 20:26, Jens Lehmann wrote:
Am 07.04.2014 23:46, schrieb Ronald Weiss:
Then, on top of that, I'll prepare patches for add to honor ignore
from .gitmodules, and -f implying --ignore-submodules. That might need
more discussion, let's see.
Makes sense.
I thought more about that,
On Apr 12, 2014, at 10:07, Matthieu Moy wrote:
Kyle J. McKay mack...@gmail.com writes:
On Apr 11, 2014, at 10:30, Matthieu Moy wrote:
Kyle J. McKay mack...@gmail.com writes:
There are already nested functions with file inclusion between both
levels of nesting in git-rebase--interactive.sh
42 matches
Mail list logo
