On Apr 12, 2014, at 10:07, Matthieu Moy wrote:
> "Kyle J. McKay" writes:
>
>> On Apr 11, 2014, at 10:30, Matthieu Moy wrote:
>>> "Kyle J. McKay" writes:
>>>
There are already nested functions with file inclusion between both
levels of nesting in git-rebase--interactive.sh and git-rebase
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 abou
Signed-off-by: Dave Borowitz
---
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 binary other than the
#
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
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
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 nex
Inline comment had incorrect grammar. Fix grammatical mistakes and
reflect actual behavior of the function.
Signed-off-by: Brian Gesiak
---
builtin/checkout.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 63151e0..abe1161 10
On 8. 4. 2014 20:43, Jens Lehmann wrote:
Useful 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 outputs a
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,
Am 11.04.2014 21:23, schrieb Junio C Hamano:
> Jeff King 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.
>>>
>>> H
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 all transport helpers using fast-export.
> > >
>
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 "git push" failed due to merge conflict. So far so
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
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 fast-{import,
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 --git a/trans
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
--- a/tra
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/tran
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
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/transport-helpe
Signed-off-by: Ralf Thielow
---
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
@@ -6108,7 +6108,7 @@ msgstr "
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 f50
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/transp
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
---
transport-help
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;
- (*r
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-hg.sh
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 fil
Daniel Liew wrote:
> git-remote-hg : Enable use of, $GIT_DIR/hg/origin/clone/.hg/hgrc
>
> Use the hgrc configuration file in the internal mercurial repository in
> addition to the other system wide hgrc files. This is done by using the
> 'ui' object from the 'repository' object which will have loa
From: Junio C Hamano
>
> 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 the command
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
"Kyle J. McKay" writes:
> On Apr 11, 2014, at 10:30, Matthieu Moy wrote:
>> "Kyle J. McKay" 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 introducing anything n
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:
> >
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 @{p
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 g
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
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
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 confusi
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
Am 11.04.2014 um 22:38 schrieb Torsten Bögershausen :
> 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, but
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 t
On Sat, Apr 12, 2014 at 11:19 AM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Sat, Apr 12, 2014 at 3:43 AM, Junio C Hamano wrote:
>>> Having said that, nobody sane would be running two simultaneous
>>> operations that are clearly write-oriented competing with each other
>>> against the sa
Junio C Hamano 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 uncontrolle
42 matches
Mail list logo
