[PATCH 1/2] Demonstrate rebase fails when the editor saves with CR/LF

Based on a bug report by Chad Boles. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- t/t3404-rebase-interactive.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3de0b1d..5dfa16a

Re: [PATCH 2/2] sh-setup: explicitly mark CR as a field separator

Hi Philip, On Sun, 25 Oct 2015, Philip Oakley wrote: > From: "Johannes Schindelin" <johannes.schinde...@gmx.de> > > @@ -13,7 +13,7 @@ unset CDPATH > > # do not equate an unset IFS with IFS with the default, so here is > > # an explicit SP HT LF. > &g

Re: [PATCH 2/2] sh-setup: explicitly mark CR as a field separator

Hi Brian, re-Cc:ing the Git mailing list. On Sun, 25 Oct 2015, brian m. carlson wrote: > On Sun, Oct 25, 2015 at 01:50:32PM +0100, Johannes Schindelin wrote: > > This is the correct thing to do, really: we already specify LF as > > field separator. > > > > Incidenta

[PATCH 2/2] sh-setup: explicitly mark CR as a field separator

This is the correct thing to do, really: we already specify LF as field separator. Incidentally, this fixes the problem interactive rebase has when the editor wants to save text with CR/LF line endings, as WordPad does in Windows 10. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx

[PATCH 0/2] Fix interactive rebase when the editor saves with CR/LF

osen over-eager check_bad_cmd check"). The proposed fix is to teach *all* shell scripts in Git to accept CR as a field separator. Since LF is already specified as such, it should be an uncontentious change. Johannes Schindelin (2): Demonstrate rebase fails when the editor saves w

Re: [PATCH v2 0/2] Fix interactive rebase when the editor saves with CR/LF

Hi Junio, On Sun, 25 Oct 2015, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > > Chad Boles reported that `git rebase -i` recently started producing > > errors when the editor saves files with DOS line endings. The symptom >

Re: [PATCH v2 2/2] sh-setup: explicitly mark CR as a field separator

Hi Junio, On Mon, 26 Oct 2015, Junio C Hamano wrote: > I asked Dscho if the shell is done correctly _for_ the platform. This assumes that the platform is either CR/LF or LF. That is incorrect. Windows does *not* dictate the line endings to be CR/LF. Certain applications do. The shell is an

Re: [PATCH v2 0/2] Fix interactive rebase when the editor saves with CR/LF

Hi Junio, On Mon, 26 Oct 2015, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > > A simple test with CR/LF line endings in a script reveals that it is > > pretty solid: > > > > x=a > > case "$x" in

Re: [PATCH 3/6] Facilitate debugging Git executables in tests with gdb

Hi Jonathan, On Mon, 26 Oct 2015, Jonathan Nieder wrote: > Johannes Schindelin wrote: > > > --- a/wrap-for-bin.sh > > +++ b/wrap-for-bin.sh > > @@ -19,4 +19,11 @@ GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale' > > PATH='@@BUILD_DIR@@/bin-wrappers:'&qu

[PATCH v3 1/2] Demonstrate rebase fails when the editor saves with CR/LF

Based on a bug report by Chad Boles. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- t/t3404-rebase-interactive.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3de0b1d..5dfa16a

Re: [PATCH v2 2/2] sh-setup: explicitly mark CR as a field separator

Hi Junio, On Mon, 26 Oct 2015, Junio C Hamano wrote: > Subject: [PATCH] rebase-i: work around Windows CRLF line endings > > Editors on Windows can and do save text files with CRLF line > endings, which is the convention on the platform. We are seeing > reports that the "read" command in a port

[PATCH v3 0/2] Fix interactive rebase when the editor saves with CR/LF

osen over-eager check_bad_cmd check"). The proposed fix is to teach *all* shell scripts in Git to accept CR as a field separator. Since LF is already specified as such, it should be an uncontentious change. Johannes Schindelin (1): Demonstrate rebase fails when the editor saves with CR/L

[PATCH v3 2/2] rebase-i: work around Windows CRLF line endings

y as an empty line to work this around. Signed-off-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- git-rebase--interactive.sh| 13 + t/t3404-rebase-interactive.sh | 2 +- 2 files changed, 14 insertions(+),

Re: [PATCH v3 2/2] rebase-i: work around Windows CRLF line endings

Hi, On Tue, 27 Oct 2015, Johannes Schindelin wrote: > diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh > index 5dfa16a..98eb49a 100755 > --- a/t/t3404-rebase-interactive.sh > +++ b/t/t3404-rebase-interactive.sh > @@ -1261,7 +1261,7 @@ test_expect_succes

Re: [PATCH v3 2/2] rebase-i: work around Windows CRLF line endings

Hi Junio, On Tue, 27 Oct 2015, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > > My apologies: I forgot to spell out explicitly that this passes in Git > > for Windows 2.x' SDK: It does. > > Can you add that to the log messag

[PATCH v4 1/2] Demonstrate rebase fails when the editor saves with CR/LF

Based on a bug report by Chad Boles. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- t/t3404-rebase-interactive.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3de0b1d..5dfa16a

[PATCH v4 0/2] Fix interactive rebase when the editor saves with CR/LF

iteration clarifies the comments in git-rebase--interactive, updates the commit message to state that this has been tested with Git for Windows, and replaces the description of the proposed fix with a description of the actual work-around provided by Junio. Johannes Schindelin (1): Demonstrate rebase f

[PATCH v4 2/2] rebase-i: work around Windows CRLF line endings

y as an empty line to work this around. This patch passes the test with Git for Windows, where the issue was seen first. Signed-off-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- git-rebase--interactive.sh| 12 t/

Re: [PATCH 2/6] remote-http(s): Support SOCKS proxies

Hi, On Tue, 27 Oct 2015, Johannes Schindelin wrote: > On Mon, 26 Oct 2015, Junio C Hamano wrote: > > > James McCoy <vega.ja...@gmail.com> writes: > > > > >> The code looks OK but the last paragraph makes _us_ worried. What > > >&g

Re: [PATCH 2/6] remote-http(s): Support SOCKS proxies

Hi, On Mon, 26 Oct 2015, Junio C Hamano wrote: > James McCoy writes: > > >> The code looks OK but the last paragraph makes _us_ worried. What > >> is the licensing status of the original at SO? > > > > According to Stackoverflow[0], > > > > As noted in the Stack

[PATCH 3/6] Facilitate debugging Git executables in tests with gdb

When prefixing a Git call in the test suite with 'TEST_GDB_GIT=1 ', it will now be run with GDB, allowing the developer to debug test failures more conveniently. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- wrap-for-bin.sh | 7 +++ 1 file changed, 7 insertions(+)

[PATCH 4/6] Squelch warning about an integer overflow

We cannot rely on long integers to have more than 32 bits... Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- git-compat-util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-compat-util.h b/git-compat-util.h index 805d0e2..610e8a5 100644 ---

[PATCH 5/6] Silence GCC's "cast of pointer to integer of a different size" warning

When calculating hashes from pointers, it actually makes sense to cut off the most significant bits. In that case, said warning does not make a whole lot of sense. So let's just work around it. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- compat/regex/regcomp

[PATCH 6/6] Correct fscanf formatting string for I64u values

lt;w.male...@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- builtin/gc.c | 2 +- git-compat-util.h | 4 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin/gc.c b/builtin/gc.c index b677923..df3e454 100644 --- a/builtin/gc.c +++ b/buil

[PATCH 2/6] remote-http(s): Support SOCKS proxies

ulting in a error message like: fatal: unable to access 'http://.../': Proxy CONNECT aborted This patch was required to work behind a faulty AP and scraped from http://stackoverflow.com/questions/15227130/#15228479 and guarded with an appropriate cURL version check by Johannes Schindelin. Sign

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

Hi, On Wed, 21 Oct 2015, Johannes Sixt wrote: > Am 21.10.2015 um 17:51 schrieb Ramsay Jones: > > On 20/10/15 22:24, Junio C Hamano wrote: > > > Junio C Hamano writes: > > > some numbers on my desktop (Dell T3500 2.66GHz Xeon X5650 with 12GB, > > > running Ubuntu), > > > > I

[PATCH 0/6] Miscellaneous platform-independent patches from Git for Windows

the phone to be able to continue developing Git for Windows. This is the first patch series attempting to lift the patches from Git for Windows' friendly fork into upstream Git. Johannes Schindelin (4): Only use CURLOPT_LOGIN_OPTIONS if it is actually available Facilitate debugging Git executables

[PATCH 1/6] Only use CURLOPT_LOGIN_OPTIONS if it is actually available

This fixes the compilation on an older Linux that was used to debug test failures when upgrading Git for Windows to Git v2.3.0. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- imap-send.c | 4 1 file changed, 4 insertions(+) diff --git a/imap-send.c b/imap-send.c

shell scripting woes, was Re: [PATCH 2/2] sh-setup: explicitly mark CR as a field separator

Hi Brian, On Sun, 25 Oct 2015, Johannes Schindelin wrote: > On Sun, 25 Oct 2015, brian m. carlson wrote: > > > On Sun, Oct 25, 2015 at 01:50:32PM +0100, Johannes Schindelin wrote: > > > This is the correct thing to do, really: we already specify LF as

[PATCH v2 1/2] Demonstrate rebase fails when the editor saves with CR/LF

Based on a bug report by Chad Boles. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- t/t3404-rebase-interactive.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3de0b1d..5dfa16a

[PATCH v2 0/2] Fix interactive rebase when the editor saves with CR/LF

osen over-eager check_bad_cmd check"). The proposed fix is to teach *all* shell scripts in Git to accept CR as a field separator. Since LF is already specified as such, it should be an uncontentious change. Johannes Schindelin (2): Demonstrate rebase fails when the editor saves w

[PATCH v2 2/2] sh-setup: explicitly mark CR as a field separator

This is the correct thing to do, really: we already specify LF as field separator. Incidentally, this fixes the problem interactive rebase has when the editor wants to save text with CR/LF line endings, as WordPad does in Windows 10. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx

Re: Question about about a trivial merge conflict that git should resolve alone

Hi Francis, On Fri, 23 Oct 2015, Francis Moreau wrote: > I have a simple merge conflict use case: > > $ mkdir foo > $ cd foo/ > $ git init > $ echo line1 > a > $ git add . > $ git commit -q -m init > $ echo line2 >>a > $ git commit -a -q -m "add line2" > $ git checkout -b foo HEAD~1 > $ git

Announcing Git for Windows 2.6.3

Dear Git users, it is my pleasure to announce that Git for Windows 2.6.3 is available from https://git-for-windows.github.io/ Changes since Git for Windows v2.6.2 (October 19th 2015) New Features • Comes with Git v2.6.3. • Enables the stack smasher to protect against buffer overflows. Bug

Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

Hi Peff, On Fri, 13 Nov 2015, Jeff King wrote: > It's possible somebody could be doing something clever with $SHELL, but > I kind of doubt it. If they want to do something clever, it is much > easier to put it directly on the exec line, and have the normal $SHELL > run their clever thing. To

Re: [bug] git 2.6.2 (64-bit) blocks keyboard input (running in RDP, Win7 x64)

Hi Vasily, On Tue, 10 Nov 2015, Ryabov, Vasily V wrote: > I'm trying to run something like this (on the remote machine (Win7 x64 with > git 2.6.2 64-bit) through RDP): > ``` > git pull --tags --progress ssh://@:/ > +refs/heads/*:refs/remotes/origin/* > ``` > It worked on local machine with git

Re: GitGui: get rid of information popup window

Hi Francis, On Thu, 12 Nov 2015, Francis ANDRE wrote: > This popup saying that "No difference has been detected" is little bit > boring and useless since it states that an automatic resync will be > started and there is no way to stop the resync. > > Can GitGui remove this popup? No, Git GUI

Re: [PATCH 2/6] remote-http(s): Support SOCKS proxies

Hi Pat, On Mon, 9 Nov 2015, Pat Thoyts wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > >On Tue, 27 Oct 2015, Johannes Schindelin wrote: > > > >> On Mon, 26 Oct 2015, Junio C Hamano wrote: > >> > >> > James McCoy <

Re: [PATCH v4 0/9] Reduce index load time

Hi Duy, On Sun, 1 Nov 2015, Nguyễn Thái Ngọc Duy wrote: > This is the rebased version since last time [1] with > s/free_index_shm/release_index_shm/ as suggested by David Turner. It > introduces a daemon that can cache index data in memory so that > subsequent git processes can avoid reading

Re: fatal: Unable to read current working directory: No error

Hi Sean, On Tue, 27 Oct 2015, Sean Krauth wrote: > I've encountered a problem and I haven't had any success with my own > troubleshooting or googling so I'd appreciate some help. I noticed the > issue originally when I changed a file name in windows explorer. I was > working on a website and I

Re: [git-for-windows] Git a single file from remote

Hi Chaz, On Mon, 16 Nov 2015, Chaz wrote: > An origin git repository has been setup. Added a remote repository > (remotegit). > > "git remote -v show" displays both origin and remote links. > > What is the best way to copy a single file from the remote repo to the > origin repo? This is

Re: Problem with gitk since git-version 2.6, probably a problem with language/locale

Hi Manuel, On Tue, 17 Nov 2015, Manuel Neubauer wrote: > since git-version 2.6, I get the following error on all of the machines here > at work: > > Error in startup script: bad menu entry index "Ansicht bearbeiten ..." > while executing > ".bar.view entryconf [mca "Edit view..."] -state

Re: fatal: Unable to read current working directory: No error

Hi Peff, On Wed, 28 Oct 2015, Jeff King wrote: > On Tue, Oct 27, 2015 at 07:29:39PM -0400, Sean Krauth wrote: > > > This seemed like about as good of an excuse as any to update Git. I > > was running v. 2.5.1-32-bit and so I downloaded v. 2.6.2-32-bit, > > installed it. And it ran, kinda. I no

RE: [PATCH 3/6] Facilitate debugging Git executables in tests with gdb

Hi Victor, On Sat, 31 Oct 2015, Victor Leschuk wrote: > > > +if test -n "$TEST_GDB_GIT" > > > +then > > > + exec gdb -args "${GIT_EXEC_PATH}/@@PROG@@" "$@" > > Maybe we could make $TEST_GDB_GIT not just a boolean flag? It would be > > useful > > to contain "gdb" executable name. It would

[PATCH 0/2] Fix Git GUI in Git for Windows 2.x

lnk` file that fails to launch the Git GUI in Git for Windows 2.x. This topic branch fixes both bugs. Johannes Schindelin (2): git-gui: fix detection of Cygwin git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut` git-gui.sh | 10 -- lib/shortcut.tcl |

[PATCH 1/2] git-gui: fix detection of Cygwin

in 64-bit mode at all. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- git-gui.sh | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index 11048c7..9038a4c 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -270,12 +270,10 @

[PATCH 2/2] git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut`

ose environment variable woes, Git for Windows comes with a convenient `git-gui.exe`, so let's just use it when it is available. This fixes https://github.com/git-for-windows/git/issues/448 Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- lib/shortcut.tcl | 14 ++ 1 fil

Re: [PATCH 3/6] Facilitate debugging Git executables in tests with gdb

Hi Jonathan, On Fri, 30 Oct 2015, Jonathan Nieder wrote: > Junio C Hamano wrote: > > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > >> On Tue, 27 Oct 2015, Junio C Hamano wrote: > > >>> It can be called GDB=1, perhaps? > >>

Re: [PATCH 3/6] Facilitate debugging Git executables in tests with gdb

Hi Victor, On Thu, 29 Oct 2015, Victor Leschuk wrote: > > +if test -n "$TEST_GDB_GIT" > > +then > > + exec gdb -args "${GIT_EXEC_PATH}/@@PROG@@" "$@" > Maybe we could make $TEST_GDB_GIT not just a boolean flag? It would be useful > to contain "gdb" executable name. It would allow to set path

Re: [PATCH 4/6] Squelch warning about an integer overflow

Hi Junio, On Mon, 26 Oct 2015, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > > We cannot rely on long integers to have more than 32 bits... > > > > Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> &g

Re: [PATCH 3/6] Facilitate debugging Git executables in tests with gdb

Hi Peff, On Tue, 27 Oct 2015, Jeff King wrote: > On Tue, Oct 27, 2015 at 09:34:48AM -0700, Junio C Hamano wrote: > > > Yeah, that was my first reaction when I saw this patch. Instead of > > having to munge that line to "gdb -whatever-args git", you can do a > > single-shot debugging in a

Re: [PATCH 3/6] Facilitate debugging Git executables in tests with gdb

Hi Jonathan, On Tue, 27 Oct 2015, Johannes Schindelin wrote: > On Mon, 26 Oct 2015, Jonathan Nieder wrote: > > > Does the 'exec' after the fi need this as well? exec is supposed to > > itself print a message and exit when it runs into an error. Would > > including an

Re: [PATCH 2/6] remote-http(s): Support SOCKS proxies

Hi Junio, On Tue, 27 Oct 2015, Junio C Hamano wrote: > We are very lucky that the original was posted to SO by our friend > Pat, and you did the right thing to ask Pat to relicense. I suspect Pat is on a six month trip around the globe or something, judging from the feedback I got here:

Re: [PATCH 3/6] Facilitate debugging Git executables in tests with gdb

Hi Junio, On Tue, 27 Oct 2015, Junio C Hamano wrote: > It can be called GDB=1, perhaps? No, this is way too generic. As I only test that the environment variable's existence, even something like GDB=/usr/opt/gdb/bin/gdb would trigger it. I could be talked into GDB_GIT=1, though. Ciao, Dscho

Re: Alternative to manual editing with git add --patch

Hi Sven & Junio, On Thu, 15 Oct 2015, Sven Helmberger wrote: > Am 14.10.2015 um 19:50 schrieb Junio C Hamano: > > Sven Helmberger writes: > > > > As a quick-and-dirty change, you could invent a new variant of > > 's'plit that breaks a N-line hunk into N hunks with

Re: [PATCH v3 1/3] Add Travis CI support

Hi, On Thu, 15 Oct 2015, Matthieu Moy wrote: > Lars Schneider writes: > > > I was reluctant to this because I feared problems. Especially while > > running tests in parallel. > > Isn't the point of using a CI tool to notice problems? ;-) > > More seriously, running

Re: How to rebase when some commit hashes are in some commit messages

Hi Francois-Xavier, On Thu, 15 Oct 2015, Francois-Xavier Le Bail wrote: > On 13/10/2015 15:29, Philip Oakley wrote: > > > Thus the only sha1 numbers that could be used are those that are > > within the (possibly implied) instruction sheet (which will list the > > current sha1s that will be

Re: Alternative to manual editing with git add --patch

Hi Sven, On 2015-10-14 17:07, Sven Helmberger wrote: > What I then often encountered was the situation where I happened to have > inserted consecutive lines of code that conceptually belong to different > commits. Normally I can nicely split patches, but not in this case, > making manually

Re: Alternative to manual editing with git add --patch

Hi Sven, On Thu, 15 Oct 2015, Sven Helmberger wrote: > Am 15.10.2015 um 12:11 schrieb Johannes Schindelin: > > > > This is all technically sound. From a usability perspective I would wish > > more for a way to exclude or filter the lines by a pattern. > > Why not

Re: [PATCH] Use the alternates of the source repository for dissociating clone

Hi Alex, On Thu, 15 Oct 2015, Alexander Riesen wrote: > The "--dissociate" option required reference repositories, which sometimes > demanded a look into the objects/info/alternates by the user. As this > is something which can be figured out automatically, do it in the > clone unless there is

Re: [PATCH v3 3/4] Add a function to release all packs

Hi Junio, On 2015-10-07 19:49, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > >> On Windows, files that are in use cannot be removed or renamed. That >> means that we have to release pack files when we are about to, say, >>

Re: [PATCH v3 2/2] pack-objects: do not get distracted by broken symrefs

Hi Junio, On 2015-10-07 19:45, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > >> It is quite possible for, say, a remote HEAD to become broken, e.g. >> when the default branch was renamed. >> >> We should still be able t

Announcing Git for Windows 2.6.2

Hi all, it is my pleasure to announce that Git for Windows 2.6.2 is available. Please find it at https://git-for-windows.github.io/ Changes since Git for Windows v2.6.1 (October 5th 2015) New Features • Comes with Git v2.6.2 • Users who are part of a Windows domain now have sensible

Re: Git bug report: git doesn't change working directory

Hi Khải, On Sat, 17 Oct 2015, Khải wrote: > I'm using Windows 10. Before I install git 2.6.1.windows.1, I have > installed git 1.9.5.github.0 (by installing GitHub Desktop), it works > just fine. Good. > But when I installed git 2.6.1.windows.1 (from git-scm.com), I'm not > able to use git

[PATCH 1/2] merge_recursive_options: introduce the "gentle" flag

asily done. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- merge-recursive.c | 44 +++- merge-recursive.h | 1 + 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 44d85be

[PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

return void, fixing this part is more involved, so I would like to avoid it, unless it is deemed absolutely necessary to address in this patch series. Johannes Schindelin (2): merge_recursive_options: introduce the "gentle" flag pull --rebase: reinstate helpful message on abort bu

[PATCH 2/2] pull --rebase: reinstate helpful message on abort

r. Not what we want. So let's set the newly-introduced `gentle` flag to get a chance to print the helpful advice. Reported by Brendan Forster. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- builtin/am.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/am.c b

Re: [PATCH v3 2/2] pack-objects: do not get distracted by broken symrefs

Hi Junio, On 2015-10-08 21:42, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > >> Would yo kindly add the line >> >> This fixes https://github.com/git-for-windows/git/issues/423 >> >> before the Signed-off-by lines?

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Hi Junio & Paul, On 2015-10-09 03:40, Paul Tan wrote: > On Fri, Oct 9, 2015 at 8:52 AM, Junio C Hamano <gits...@pobox.com> wrote: >> Johannes Schindelin <johannes.schinde...@gmx.de> writes: >> >>> Brendan Forster noticed that we no longer see the help

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Me again, On 2015-10-09 11:50, Johannes Schindelin wrote: > > On 2015-10-09 03:40, Paul Tan wrote: >> On Fri, Oct 9, 2015 at 8:52 AM, Junio C Hamano <gits...@pobox.com> wrote: >>> Johannes Schindelin <johannes.schinde...@gmx.de> writes: >>> >>

Re: [PATCH 2/2] pull --rebase: reinstate helpful message on abort

Hi Junio, On 2015-10-09 20:36, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > >> When calling `git pull --rebase`, things can go wrong. In such a case, >> we want to tell the user about the most common ways out of this fix: >> ..

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Hi Junio, On 2015-10-09 20:40, Junio C Hamano wrote: > Junio C Hamano writes: > >>> Instead, stepping back a bit, I wonder if we can extend coverage of >>> the helpful message to all die() calls when running git-am. We could >>> just install a die routine with

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Hi Junio, On 2015-10-09 20:55, Junio C Hamano wrote: > Junio C Hamano writes: > > I would prefer the endgame to be an efficient implementation of > merge_recursive_generic(), a function that you can call without you > having to worry about it dying. > > But the patch in this

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Hi Torsten, On 2015-10-10 18:05, Torsten Bögershausen wrote: > On 09.10.15 12:11, Johannes Schindelin wrote: >> Me again, >> >> On 2015-10-09 11:50, Johannes Schindelin wrote: >>> >>> On 2015-10-09 03:40, Paul Tan wrote: >>>> On Fri, Oct 9,

Re: [PATCH] pretend_sha1_file(): Change return type from int to void

Hi Tobias, On 2015-10-06 15:51, Tobias Klauser wrote: > On 2015-10-06 at 15:16:12 +0200, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: >> >> On 2015-10-06 14:15, Tobias Klauser wrote: >> > prented_sha1_file() always returns 0 and its only callsite in

Re: Unable to get GIT GUI to start on Windows XP - Git-1.9.4-preview20140929

Hi Mr Ithia, On 2015-10-06 15:49, Mr Tava Ithia wrote: > Dear Support Not quite... This is an Open Source project, not a paid-for support ;-) > Can you please assist me, as I've got this issue starting up GIT GUI on > Windows XP, Service Pack 3 Have you tried the current Git for Windows

Re: [PATCH] clone --dissociate: avoid locking pack files

Hi Max, On 2015-10-01 06:39, Max Kirillov wrote: > On Wed, Sep 30, 2015 at 10:28:14PM +0300, Max Kirillov wrote: >> On Mon, Sep 28, 2015 at 09:44:57PM +0200, Johannes Schindelin wrote: >>> - if (option_dissociate) >>> + if (option_dissociate) { >>&

Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails

Hi Junio, On 2015-10-12 22:28, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > >>> I think the most sensible regression fix as the first step at this >>> point is to call it as a separate process, just like the code calls >

[PATCH v2 4/4] clone --dissociate: avoid locking pack files

not need to be run on Linux or MacOSX. It won't hurt, either, though. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- builtin/clone.c| 4 +++- t/t5700-clone-reference.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin/clo

[PATCH v2 3/4] Add a function to release all packs

in `free_pack_by_name()` into the `close_pack()` function that is used by the new `close_all_packs()` function to avoid repeated code. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- cache.h | 1 + sha1_file.c | 20 +--- 2 files changed, 18 insertions

[PATCH v2 0/4] Fix locking issues on Windows with `git clone --dissociate`

This is version 2, split into multiple commits for easier digestion. Max, I hope that this helps also your use case! Johannes Schindelin (4): Demonstrate a Windows file locking issue with `git clone --dissociate` Consolidate code to close a pack's file descriptor Add a function to release

Announcing Git for Windows 2.6.1

Dear Git users, it is my pleasure to announce version 2.6.1 of Git for Windows, available from https://git-for-windows.github.io/. Changes since Git for Windows 2.6.0 (September 29th 2015) New Features • Comes with Git 2.6.1 • The installer now writes the file /etc/install-options.txt to

[PATCH v2 2/4] Consolidate code to close a pack's file descriptor

There was a lot of repeated code to close the file descriptor of a given pack. Let's just refactor this code into a single function. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- sha1_file.c | 38 ++ 1 file changed, 18 insertions(

RE: Git installer questions

On 2015-07-07 23:39, McChesney, Adam wrote: I am curious as whether or not the windows installer has silent install flags that are configurable for automated installation? I was looking about the documentation and haven't been able to find them, if it does exist in the documentation could you

Re: Draft of Git Rev News edition 5

Hi, On 2015-07-08 12:29, Christian Couder wrote: On Wed, Jul 8, 2015 at 9:43 AM, Junio C Hamano gits...@pobox.com wrote: Michael J Gruber g...@drmicha.warpmail.net writes: Just as an example, in the section on visualizing merge diffs after the fact, few people will be interested in the

Re: [PATCH] git-filter-branch.sh: clarify an error message

Hi Chris, On 2015-07-11 04:04, Chris Jones wrote: How does You did not provide a valid range of commits. At least one tip in your range must be a ref. sound? Maybe a bit shorter, as well as less accusing (which You did not...! may sound): filter-branch requires a valid commit range.

Re: What's cooking in git.git (Jul 2015, #03; Fri, 10)

Hi Junio, On 2015-07-11 00:45, Junio C Hamano wrote: * et/http-proxyauth (2015-06-29) 1 commit (merged to 'next' on 2015-07-09 at cf80874) + http: always use any proxy auth method available We used to ask libCURL to use the most secure authentication method available when talking to

Re: undocumented core.sharedRepository=2 set by git init --shared=world

Hi John, On 2015-07-07 11:10, John Keeping wrote: On Tue, Jul 07, 2015 at 10:14:28AM +0200, Johannes Schindelin wrote: Hi Joey, On 2015-07-06 21:25, Joey Hess wrote: joey@darkstar:~/tmpgit init --shared=world testrepo Initialized empty shared Git repository in /home/joey/tmp/testrepo/.git

Re: [PATCH 1/5] submodule: implement `module_clone` as a builtin helper

Hi Stefan, thank you so much for doing this. `git submodule` is really, really slow on Windows... On 2015-08-27 02:52, Stefan Beller wrote: diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 4b32a3c..f11fb9c 100644 --- a/builtin/submodule--helper.c +++

Re: [PATCH 2/5] thread-utils: add a threaded task queue

Hi Stefan, On 2015-08-27 02:52, Stefan Beller wrote: diff --git a/run-command.c b/run-command.c index 28e1d55..cb15cd9 100644 --- a/run-command.c +++ b/run-command.c @@ -668,6 +668,22 @@ int git_atexit(void (*handler)(void)) #endif +void setup_main_thread(void) [...] diff --git

[PATCH] Mingw: verify both ends of the pipe () call

From: jfmc jfm...@gmail.com The code to open and test the second end of the pipe clearly imitates the code for the first end. A little too closely, though... Let's fix the obvious copy-edit bug. Signed-off-by: Jose F. Morales jfm...@gmail.com Signed-off-by: Johannes Schindelin johannes.schinde

Re: [PATCH] Mingw: verify both ends of the pipe () call

Hi all, On 2015-08-27 17:55, Johannes Schindelin wrote: From: jfmc jfm...@gmail.com The code to open and test the second end of the pipe clearly imitates the code for the first end. A little too closely, though... Let's fix the obvious copy-edit bug. Signed-off-by: Jose F. Morales jfm

Re: http.c (curl_easy_setopt and CURLAUTH_ANY)

Hi Stephen, On 2015-08-28 08:07, Stephen Kazakoff wrote: When I'm behind a proxy (with BASIC authentication), I'm unable to perform a git clone. I managed to fix this by editing http.c and recompiling. The change I'd like to propose is to line 452. From: curl_easy_setopt(result,

[PATCH v2] Mingw: verify both ends of the pipe () call

From: Jose F. Morales jfm...@gmail.com The code to open and test the second end of the pipe clearly imitates the code for the first end. A little too closely, though... Let's fix the obvious copy-edit bug. Signed-off-by: Jose F. Morales jfm...@gmail.com Signed-off-by: Johannes Schindelin

Re: [PATCH] Mingw: verify both ends of the pipe () call

Hi Jose, Please do not top-post; I use top-posting as a tell-tale for mails I can safely delete unread when I have too many mails in my inbox. On 2015-08-28 08:37, Jose F. Morales wrote: Ops... my fault. I was playing with the web editor and forgot that my profile didn't had my real name (now

Re: [PATCH] Mingw: verify both ends of the pipe () call

Hi, On 2015-08-28 11:39, Johannes Schindelin wrote: On 2015-08-28 08:37, Jose F. Morales wrote: Could I still amend the commit? (it seems to be already pushed into master) It was pushed to Git for Windows' master, but here it was submitted to the Git mailing list. Junio, would you

Re: [PATCH 0/9] Progress with git submodule

Hi Stefan, On 2015-08-28 03:14, Stefan Beller wrote: Stefan Beller (9): submodule: implement `module_list` as a builtin helper submodule: implement `module_name` as a builtin helper submodule: implement `module_clone` as a builtin helper Another thing that just hit me: is there any

Re: [PATCH] Mingw: verify both ends of the pipe () call

Hi Jonathan, On 2015-08-27 23:50, Jonathan Nieder wrote: Johannes Schindelin wrote: From: jfmc jfm...@gmail.com This means the name shown by git shortlog would be jfmc instead of Jose F. Morales. Intended? Fixed in v2 ;-) Ciao, Dscho -- To unsubscribe from this list: send the line

Re: git Dockerfile for ppc64le

Hi, On 2015-08-25 06:37, Gawade P wrote: > I have built and tested the latest version on git on multiple > distributions including Ubuntu 15.04 on the ppc64le architecture. I > have run the complete test suite and verified that there are no test > failures. > > I have also written a dockerfile

Git for Windows 2.5.1 is out

Dear Git (for Windows) users, it is my pleasure to announce the release of Git for Windows 2.5.1. Apart from synchronizing with Git 2.5.1, the following bugs were fixed: • Backspace works now with ConHost-based (cmd.exe) terminal. • When there is a ~/.bashrc but no ~/.bash_profile, the

<    3   4   5   6   7   8   9   10   11   12   >