Re: [PATCH v2 2/4] stripspace: Use parse-options for command-line parsing

On 2015-10-17 at 23:24:13 +0200, Junio C Hamano wrote: > Tobias Klauser writes: > > > On 2015-10-16 at 19:29:35 +0200, Junio C Hamano wrote: > >> Junio C Hamano writes: > >> > >> >> - if (mode == INVAL) > >>

Commit 5841520b makes it impossible to connect to github from behind my company's firewall.

Commit 5841520b makes it impossible to connect to github from behind my company's firewall. I'm running CYGWIN_NT-6.1 and the default git version 2.5.3 complains with a fatal error when trying to git pull: $ /bin/git --version git version 2.5.3 $ /bin/git pull fatal: unable to access

Git-p4 fails with NameError with python 2.7.2

Hello, Git-p4 fail when I try to rebase with the error: "NameError: global name 'ctypes' is not defined". The error occurs when I use python 2.7.2 that is installed by default on my company's computers (it goes without saying that everything works fine with python 2.7.10). I'm a beginner in

Re: Git-p4 fails with NameError with python 2.7.2

On 20 October 2015 at 11:34, Etienne Girard wrote: > Hello, > > Git-p4 fail when I try to rebase with the error: "NameError: global > name 'ctypes' is not defined". The error occurs when I use python > 2.7.2 that is installed by default on my company's computers (it

Re: Commit 5841520b makes it impossible to connect to github from behind my company's firewall.

Hi, I'm just Cc-ing Enrique, the author of 5841520b. Johan Laenen writes: > Commit 5841520b makes it impossible to connect to github from behind my > company's firewall. > > I'm running CYGWIN_NT-6.1 and the default git version 2.5.3 complains with a > fatal

[PATCH 4/4] gitk: Add accelerator to German locale

Assigned either to the first letter or some unique letter. At least there are no conflicts, as far as I see... Signed-off-by: Takashi Iwai --- gitk-git/po/de.po | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git

[PATCH 2/4] gitk: Update msgid's for menu items with accelerator

The commit d99b4b0de27a ("gitk: Accelerators for the main menu") modified the menu item strings with the accelerator, but the translations didn't follow, thus the menus are shown without translations. This patch systematically update the msgid keys just to follow this change. The contents aren't

[PATCH 0/4] gitk crash fix and locale updates

Hi, the recent change in gitk to support the menu accelerator broke the invocation with --all option in non-English locales. Also, the whole menu translations are gone by this, too. This patchset tries to address these issues. Takashi === Takashi Iwai (4): gitk: Fix crash with --all in

[PATCH 1/4] gitk: Fix crash with --all in non-English locales

When gitk is invoked with --all option in a non-English locale, it crashes like: $ LC_ALL="de_DE.UTF-8" gitk --all Error in startup script: bad menu entry index "Ansicht bearbeiten ..." while executing ".bar.view entryconf [mca "Edit view..."] -state normal" invoked from within "if

[PATCH 3/4] gitk: Add accelerators to Japanese locale

Just follow the English accelerator keys. Signed-off-by: Takashi Iwai --- gitk-git/po/ja.po | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po index 9bbbadd3b427..59e42a89fd7e 100644 ---

Re: Commit 5841520b makes it impossible to connect to github from behind my company's firewall.

Enrique Tobis twosigma.com> writes: > > Hey! > > I'm really sorry to hear that. > > That change should enable more forms of authentication with your proxy, but it does cause libcurl to choose > the one it finds most secure, according to the docs >

Re: Commit 5841520b makes it impossible to connect to github from behind my company's firewall.

Johan Laenen writes: I'm not the only one. Another cygwin user is experiencing the exact same problem, see http://permalink.gmane.org/gmane.os.cygwin/155039 for more info. greetings, Johan -- To unsubscribe from this list: send the line "unsubscribe git" in the

Re: [PATCH] git-p4: import the ctypes module

Dennis Kaarsemaker writes: >> I do not follow Python development, but does the above mean that >> with recent 2.x you can say ctypes without first saying "import >> ctypes"? It feels somewhat non-pythonesque that identifiers like >> this is given to you without you

[PATCH 6/5] run-command: Fix missing output from late callbacks

The callbacks in the parallel processing API were given the contract, that they are not allowed to print anything to stdout/err, but the API will take care of their output needs instead. In case a child process is started, the callback can first add its messages to the buffer and then the child

Re: [PATCH] pull: add angle brackets to usage string

Alex Henrie writes: > I pushed to change [options] to [] because even if the angle > brackets don't help new users or translators in this particular case, > the angle brackets encourage Git authors to use angle brackets when > writing commands that are not so easy to

Re: [PATCH 2/5] run-command: Call get_next_task with a clean child process.

Stefan Beller writes: > If the `get_next_task` did not explicitly called child_process_init I locally did "If get_next_task did not explicitly call child_process_init" > and only filled in some fields, there may have been some stale data > in the child process. This is hard

git-cherry doesn't detect a "copied" commit

Hi, I'm seeing something odd with git-cherry: it doesn't seem to detect that a commit has been cherry-picked from master branch. This happens with the systemd git repository (from github) so it should be fairly simple to reproduce. What I did: $ git --version git version 2.6.0 $ git checkout

RE: Commit 5841520b makes it impossible to connect to github from behind my company's firewall.

From: Junio C Hamano [mailto:jch2...@gmail.com] On Behalf Of Junio C Hamano > Enrique Tobis writes: >> Hey! >> >> I'm really sorry to hear that. >> >> That change should enable more forms of authentication with your >> proxy, but it does cause libcurl to choose

Re: [PATCH v1] git-p4: Add option to ignore empty commits

larsxschnei...@gmail.com writes: > diff --git a/git-p4.py b/git-p4.py > index 0093fa3..6c50c74 100755 > --- a/git-p4.py > +++ b/git-p4.py > @@ -2288,12 +2288,6 @@ class P4Sync(Command, P4UserMap): > filesToDelete = [] > > for f in files: > -# if using a client

Re: [PATCH 1/5] run-command: Fix early shutdown

Stefan Beller writes: > The return value of `pp_collect_finished` indicates if we want to shutdown > the parallel processing early. Both returns from that function should > return any accumulated results. > > Signed-off-by: Stefan Beller > --- Makes

Re: [PATCH 2/5] run-command: Call get_next_task with a clean child process.

On Tue, Oct 20, 2015 at 11:49 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> If the `get_next_task` did not explicitly called child_process_init > > I locally did "If get_next_task did not explicitly call child_process_init" > >> and only filled in

Re: [PATCH 5/5] test-run-command: Increase test coverage

On Tue, Oct 20, 2015 at 11:53 AM, Junio C Hamano wrote: > > proc.argv = (const char **)argv + 3; > > or > > proc.argv = (const char **)[3]; ok, will fix > > Given the line immediately before refers to argv[2], the latter > might be easier on the eyes to

[PATCH] git-p4: import the ctypes module

The ctypes module is used on windows to calculate free disk space, so it must be imported. Signed-off-by: Dennis Kaarsemaker --- git-p4.py | 1 + 1 file changed, 1 insertion(+) On di, 2015-10-20 at 09:00 -0700, Junio C Hamano wrote: > Luke Diamand

Re: [PATCH 5/5] test-run-command: Increase test coverage

Stefan Beller writes: > Signed-off-by: Stefan Beller > --- > t/t0061-run-command.sh | 16 +--- > test-run-command.c | 12 > 2 files changed, 21 insertions(+), 7 deletions(-) > > diff --git a/t/t0061-run-command.sh

Re: [RFC] URL rewrite in .gitmodules

Lars Schneider writes: > If not, what do you think about a patch that adds a "url" section > similar to the one in git config to a .gitmodules file? > > Example: > -- > [submodule "git"] > path = git > url=git://github.com/larsxschneider/git.git >

How to handle false-positive with git-cherry ?

Hi, I have several "maintainance" branches which are based on different version of my software, which contains only fixes, imported with 'git cherry-pick'. I use to comparing stable branches to see if one of them is not missing a fix for instance. For that purpose I use "git cherry" of "git log

Re: Git-p4 fails with NameError with python 2.7.2

On Tue, Oct 20, 2015 at 6:00 PM, Junio C Hamano wrote: > > Luke Diamand writes: > > > On 20 October 2015 at 11:34, Etienne Girard > > wrote: > >> Hello, > >> > >> Git-p4 fail when I try to rebase with the error: "NameError:

Re: Git-p4 fails with NameError with python 2.7.2

Luke Diamand writes: > On 20 October 2015 at 11:34, Etienne Girard > wrote: >> Hello, >> >> Git-p4 fail when I try to rebase with the error: "NameError: global >> name 'ctypes' is not defined". The error occurs when I use python >> 2.7.2 that is

Re: Commit 5841520b makes it impossible to connect to github from behind my company's firewall.

Enrique Tobis writes: > Hey! > > I'm really sorry to hear that. > > That change should enable more forms of authentication with your > proxy, but it does cause libcurl to choose the one it finds most > secure, according to the docs >

Re: [PATCH v2 2/4] stripspace: Use parse-options for command-line parsing

Tobias Klauser writes: > On 2015-10-17 at 23:24:13 +0200, Junio C Hamano wrote: >> Before starting v3, please fetch from me and check what is queued on >> 'pu'. It may turn out that the fix-ups I did while queuing this >> round is sufficient, in which

Re: [PATCH] pull: add angle brackets to usage string

2015-10-19 23:17 GMT-06:00 Junio C Hamano : > Alex Henrie writes: > >> 2015-10-16 11:42 GMT-06:00 Junio C Hamano : >>> >>> Yes, but that fixes historical "mistake", no? >>> >>> With this, you are breaking historical practice by

Re: [PATCH 06/12] git submodule update: Handle unmerged submodules in C

On Tue, Oct 20, 2015 at 2:11 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Signed-off-by: Stefan Beller >> --- >> builtin/submodule--helper.c | 15 +++ >> git-submodule.sh| 6 +- >> 2 files

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

On Mon, Oct 19, 2015 at 1:42 PM, Matthieu Moy wrote: > Junio C Hamano writes: > >> I personally would suggest whichever order you feel more comfortable >> and less error-prone. > > This is a good summary, and I fully agree with it. Well then, I'm

Re: [PATCH v3 00/34] libify mailinfo and call it directly from am

Junio C Hamano writes: > During the discussion on the recent "git am" regression, I noticed > that the command reimplemented in C spawns one "mailsplit" and then > spawns "mailinfo" followed by "apply --index" to commit the changes > described in each message. As there are

Re: [PATCH 06/12] git submodule update: Handle unmerged submodules in C

Stefan Beller writes: > Signed-off-by: Stefan Beller > --- > builtin/submodule--helper.c | 15 +++ > git-submodule.sh| 6 +- > 2 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/builtin/submodule--helper.c

Re: [PATCH v3 1/1] Makefile: link libcurl before libssl

Remi Pommarel writes: > On Mon, Oct 05, 2015 at 12:41:34PM -0700, Jonathan Nieder wrote: > ... >> To protect against a value that might leak in from the environment, this >> should say >> >> IMAP_SEND_LDFLAGS = >> >> [...] > > Oups my bad. > ... So, what's the status

Re: [PATCH v3 00/34] libify mailinfo and call it directly from am

On Tue, Oct 20, 2015 at 2:24 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> During the discussion on the recent "git am" regression, I noticed >> that the command reimplemented in C spawns one "mailsplit" and then >> spawns "mailinfo" followed by

What's cooking in git.git (Oct 2015, #04; Tue, 20)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. With somewhat reduced review bandwidth, I'd expect that the upcoming cycle would be slower than usual. At tinyurl.com/gitCal, I tentatively

Re: [PATCH v3 00/34] libify mailinfo and call it directly from am

Stefan Beller writes: > As far as I understand, this only helps for mailing list workflows, which > in my limited view of the world is only found in established infrastructure > projects, who tend to be maintained by people who run some kind of > ab-nomination of unix. >

[PATCH 8/8] git submodule update: Have a dedicated helper for cloning

This introduces a new helper function in git submodule--helper which takes care of cloning all submodules, which we want to parallelize eventually. Some tests (such as empty URL, update_mode==none) are required in the helper to make the decision for cloning. These checks have been moved into the

[PATCH 7/8] submodule config: Keep update strategy around

We need the submodule update strategies in a later patch. Signed-off-by: Stefan Beller --- This may conflict with origin/sb/submodule-config-parse, but only on a syntactical level (this adds an else if {...} just after the refactoredd code). There is no clash of

[PATCH 6/8] run-command: Fix missing output from late callbacks

The callbacks in the parallel processing API were given the contract, that they are not allowed to print anything to stdout/err, but the API will take care of their output needs instead. In case a child process is started, the callback can first add its messages to the buffer and then the child

[PATCH 5/8] test-run-command: Increase test coverage

Currently we have exact 4 jobs to be run with at most 4 parallel processes. This sounds as if we're testing only one special case, but in reality we want to have any number of tasks be processed successfully, so test: * more tasks than max jobs (implying slots get reused) * equal number of jobs

[PATCH 1/8] run-command: Fix early shutdown

The return value of `pp_collect_finished` indicates if we want to shutdown the parallel processing early. Have just one return path to return any accumulated results. Signed-off-by: Stefan Beller --- run-command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[PATCH 0/8] Fixes for the parallel processing engine and git submodule update

Patches 1-6 replace the last 6 patches of sb/submodule-parallel-fetch (Patch 1,2 changed code, 3,4 stayed as is, 5 has more commit message, Patch 6 is the same again) Patches 7,8 are new in the series . Patch 7 keeps the update strategy in the cached submodue structs around, Patch 8 rewrites

[PATCH 3/8] run-command: Initialize the shutdown flag

It did work out without initializing the flag so far, but to make it future proof, we want to explicitly initialize the flag. Signed-off-by: Stefan Beller --- run-command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/run-command.c b/run-command.c index

[PATCH 4/8] test-run-command: Test for gracefully aborting

We reuse the get_next_task callback which would stop after invoking the test program 4 times. However as we have only 3 parallel processes started (We pass in 3 as max parallel processes and 3 is smaller than the spawn cap in run-command, so we will start the 3 processes in the first run

[PATCH 2/8] run-command: Call get_next_task with a clean child process.

If the `get_next_task` did not explicitly called child_process_init and only filled in some fields, there may have been some stale data in the child process. This is hard to debug and also adds a review burden for each new user of that API. To improve the situation, we pass only cleanly

Re: [PATCH] git-p4: import the ctypes module

On 20/10/15 20:36, Junio C Hamano wrote: Dennis Kaarsemaker writes: I do not follow Python development, but does the above mean that with recent 2.x you can say ctypes without first saying "import ctypes"? It feels somewhat non-pythonesque that identifiers like this

Re: [PATCH v3 00/34] libify mailinfo and call it directly from am

On Tue, Oct 20, 2015 at 3:06 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> As far as I understand, this only helps for mailing list workflows, which >> in my limited view of the world is only found in established infrastructure >> projects, who

Attention!

Congratulations! You Won £1.5 Million Pounds on our Amnesty Int online promo. File in the following for your claims Names: Sex: Country: Tel: Best Regards, Mrs. Susan Jones -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCH 2/8] run-command: Call get_next_task with a clean child process.

Stefan Beller writes: > If the `get_next_task` did not explicitly called child_process_init > and only filled in some fields, there may have been some stale data > in the child process. This is hard to debug and also adds a review > burden for each new user of that API. To

Re: [PATCH 2/8] run-command: Call get_next_task with a clean child process.

Stefan Beller writes: > If the `get_next_task` did not explicitly called child_process_init > and only filled in some fields, there may have been some stale data > in the child process. This is hard to debug and also adds a review > burden for each new user of that API. To

Re: git-credential-cache--daemon quits on SIGHUP, can we change it to ignore instead?

On Sun, Oct 18, 2015 at 1:58 PM, Junio C Hamano wrote: > I cannot speak for the person who was primarily responsible for > designing this behaviour, but I happen to agree with the current > behaviour in the situation where it was designed to be used. Upon > the first use in

[PATCH 0/2] blame: allow blame --reverse --first-parent when it makes sense

This enables --reverse --first-parent back. Max Kirillov (2): Add test to describe expectation of blame --reverse with branched history blame: allow blame --reverse --first-parent when it makes sense builtin/blame.c | 11 +-- t/t8009-blame-reverse.sh | 39

[PATCH 1/2] Add test to describe expectation of blame --reverse with branched history

If history contains merges from feature branches, `blame --reverse` reports not the commit when the line was actually edited, but head of the last merged branch which was created before the edit. As a workaround, `blame --reverse --first-parent` could be used to find the merge of branch

t5516-fetch-push.sh fails with current master (74301d6)

When building from current master (74301d6, "Sync with maint", 2015-10-20), test #75 in t5516-fetch-push.sh fails: *** t5516-fetch-push.sh *** ok 1 - setup ok 2 - fetch without wildcard [Snip 70 lines] ok 73 - fetch exact SHA1 ok 74 - shallow fetch reachable SHA1 (but not a ref),

Re: t5516-fetch-push.sh fails with current master (74301d6)

On 21 October 2015 at 03:40, Øyvind A. Holm wrote: > When building from current master (74301d6, "Sync with maint", > 2015-10-20), test #75 in t5516-fetch-push.sh fails If it's of any value, the contents from t/trash\ directory.t5516-fetch-push/ can be downloaded from

[PATCH 2/2] blame: allow blame --reverse --first-parent when it makes sense

Do not die immediately when the two flags are specified. Instead check that the specified range is along first-parent chain. Explioit how prepare_revision_walk() handles first_parent_only flag: the commits outside of first-parent chain are either unknown (and do not have any children recorded) or

Re: [PATCH 2/2] blame: allow blame --reverse --first-parent when it makes sense

On Wed, Oct 21, 2015 at 12:08 AM, Max Kirillov wrote: > Do not die immediately when the two flags are specified. Instead > check that the specified range is along first-parent chain. Explioit s/Explioit/Exploit/ > how prepare_revision_walk() handles first_parent_only flag: the

git ls-files should not show worktree files as untracked

Hi, Using git 2.6.2 I think worktree should behave consistently like submodule Run following commands ``` echo 1 > 1.txt git init git add 1.txt git commit -m "initial commit" echo 2 > 2.txt # untracked file mkdir def cd def git clone --separate-git-dir ../.git/ghi .. . # simulate an untracked

Re: t5516-fetch-push.sh fails with current master (74301d6)

On 21 October 2015 at 04:01, Øyvind A. Holm wrote: > On 21 October 2015 at 03:40, Øyvind A. Holm wrote: > > When building from current master (74301d6, "Sync with maint", > > 2015-10-20), test #75 in t5516-fetch-push.sh fails Hm, seems as I'm unable to

Re: Commit 5841520b makes it impossible to connect to github from behind my company's firewall.

Enrique Tobis twosigma.com> writes: > Johan: how are you configuring your proxy? Git configuration or environment variables? Also, could you I'm just using the https_proxy environment variable, not the git configuration: $ export https_proxy=http://:@myproxy:8080 Sorry for the multiple

Re: [PATCH] fix flaky untracked-cache test

On 19.10.15 21:48, David Turner wrote: > + echo test >base && #we need to ensure that the root dir is touched > + rm base > ' Thanks for working on this, (I can run the test as soon as I have access to a Mac with SSD) Minor remark, the echo test can be removed (and may be the comment ?)

RE: Commit 5841520b makes it impossible to connect to github from behind my company's firewall.

Hey! I'm really sorry to hear that. That change should enable more forms of authentication with your proxy, but it does cause libcurl to choose the one it finds most secure, according to the docs (http://curl.haxx.se/libcurl/c/CURLOPT_HTTPAUTH.html) What kinds of authentication does your