"git checkout" resets modified files

"git checkout" resets modified files Version git 2.5.0, Description: I was automating a process that would pull and switch to another branch when I stumbled across this. I have not been able to emulate this from command line but using go (or I imagine other languages are similar) if you execute

[PATCH v2] log: diagnose empty HEAD more clearly

On Fri, Aug 28, 2015 at 02:11:01PM -0700, Junio C Hamano wrote: > * jk/log-missing-default-HEAD (2015-06-03) 1 commit > - log: diagnose empty HEAD more clearly > > "git init empty && git -C empty log" said "bad default revision 'HEAD'", > which was found to be a bit confusing to new users. >

[PATCH] show-ref: place angle brackets around variables in usage string

Signed-off-by: Alex Henrie --- builtin/show-ref.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/show-ref.c b/builtin/show-ref.c index dfbc314..131ef28 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -8,7 +8,7 @@ static const char * const show_ref_usage

Re: What's cooking in git.git (Aug 2015, #05; Fri, 28)

> * dt/refs-bisection (2015-08-28) 5 commits > - bisect: make bisection refs per-worktree > - refs: make refs/worktree/* per-worktree > - SQUASH??? > - path: optimize common dir checking > - refs: clean up common_list > > Move the refs used during a "git bisect" session to per-worktree > hie

Re: [PATCH v2 2/2] trailer: support multiline title

On Wed, Aug 26, 2015 at 9:48 PM, Junio C Hamano wrote: > Christian Couder writes: > >> We currently ignore the first line passed to `git interpret-trailers`, >> when looking for the beginning of the trailers. >> >> Unfortunately this does not work well when a commit is created with a >> line brea

Re: http.c (curl_easy_setopt and CURLAUTH_ANY)

On Fri, Aug 28, 2015 at 04:07:36PM +1000, Stephen Kazakoff wrote: > Hi, > > 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: > > cu

Re: What's cooking in git.git (Aug 2015, #05; Fri, 28)

On Fri, Aug 28, 2015 at 5:11 PM, Junio C Hamano wrote: > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. > > You can find the changes described here in the integration branches > of the re

[ANNOUNCE] Git v2.5.1

The latest maintenance release Git v2.5.1 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.5.1' tag and the 'maint' branch that the tag points at: url = https://kernel

What's cooking in git.git (Aug 2015, #05; Fri, 28)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. You can find the changes described here in the integration branches of the repositories listed at http://git-blame.blogspot.com/p/git-publi

A note from the maintainer

Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

Re: [PATCH 7/9] fetch: fetch submodules in parallel

On Fri, Aug 28, 2015 at 11:53 AM, Jeff King wrote: > On Fri, Aug 28, 2015 at 11:50:50AM -0700, Jonathan Nieder wrote: > >> > But what I meant was: the child will only show progress if stderr is a >> > tty, but here it is not. >> >> For clone / fetch, we can pass --progress explicitly. >> >> For so

Re: [PATCH 7/9] fetch: fetch submodules in parallel

On Fri, Aug 28, 2015 at 11:44 AM, Jeff King wrote: > On Fri, Aug 28, 2015 at 11:41:17AM -0700, Stefan Beller wrote: > >> > So to an observer, it would look like a serial operation, but subsequent >> > operations after the first would magically go much faster (because >> > they'd been working and b

Re: [PATCH 7/9] fetch: fetch submodules in parallel

On Fri, Aug 28, 2015 at 11:50:50AM -0700, Jonathan Nieder wrote: > > But what I meant was: the child will only show progress if stderr is a > > tty, but here it is not. > > For clone / fetch, we can pass --progress explicitly. > > For some reason 'git checkout' doesn't support a --progress optio

Re: [PATCH 7/9] fetch: fetch submodules in parallel

Jeff King wrote: > Right, clearly we can't rely on pipe buffers to be large enough here > (though we _may_ want to rely on tempfiles if we aren't sure that the > stdout is bounded in a reasonable way). > > But what I meant was: the child will only show progress if stderr is a > tty, but here it is

Re: [PATCH 7/9] fetch: fetch submodules in parallel

Jeff King wrote: > I think Jonathan's point is that you could pick _one_ active child to > show without buffering, while simultaneously buffering everybody else's > output. Yep. Thanks for interpreting. [...] > So to an observer, it would look like a serial operation, but subsequent > operation

Re: [PATCH 7/9] fetch: fetch submodules in parallel

On Fri, Aug 28, 2015 at 11:41:17AM -0700, Stefan Beller wrote: > > So to an observer, it would look like a serial operation, but subsequent > > operations after the first would magically go much faster (because > > they'd been working and buffering in the background). > > > > And that doesn't requ

Re: [PATCH 7/9] fetch: fetch submodules in parallel

Junio C Hamano wrote: > Jonathan Nieder writes: >> remote: Finding sources: 11% (18/155) \r >> remote: Finding sources: 12% (19/155) \r >> >> With multiple commands producing such output, they will overwrite each >> other's lines, producing a mixture that is confusing and

Re: [PATCH 7/9] fetch: fetch submodules in parallel

On Fri, Aug 28, 2015 at 11:35 AM, Jeff King wrote: > On Fri, Aug 28, 2015 at 11:27:04AM -0700, Junio C Hamano wrote: > >> > But for commands that show progress like "git clone", "git checkout", >> > and "git fetch", it does not work well at all. They provide output >> > that updates itself by put

Re: [PATCH 7/9] fetch: fetch submodules in parallel

Jeff King writes: > I think Jonathan's point is that you could pick _one_ active child to > show without buffering, while simultaneously buffering everybody else's > output. When that finishes, pick a new active child, show its buffer, > and then start showing its output in realtime. And so on. >

Re: [PATCH 7/9] fetch: fetch submodules in parallel

On Fri, Aug 28, 2015 at 11:27 AM, Junio C Hamano wrote: > Jonathan Nieder writes: > >> Junio C Hamano wrote: >> >>> My preference is still (1) leave standard error output all connected >>> to the same fd without multiplexing, and (2) line buffer standard >>> output so that the output is at least

Re: [PATCH v4 2/4] path: optimize common dir checking

On Fri, 2015-08-28 at 09:39 -0700, Junio C Hamano wrote: > David Turner writes: > > > On Wed, 2015-08-26 at 18:10 -0400, David Turner wrote: > >> On Wed, 2015-08-26 at 14:15 -0700, Junio C Hamano wrote: > >> > > + * For example, consider the following set of strings: > >> > > + * abc > >> > > + *

Re: [PATCH 7/9] fetch: fetch submodules in parallel

On Fri, Aug 28, 2015 at 11:27:04AM -0700, Junio C Hamano wrote: > > But for commands that show progress like "git clone", "git checkout", > > and "git fetch", it does not work well at all. They provide output > > that updates itself by putting a carriage return at the end of each > > chunk of out

Re: [PATCH 7/9] fetch: fetch submodules in parallel

Jonathan Nieder writes: > Junio C Hamano wrote: > >> My preference is still (1) leave standard error output all connected >> to the same fd without multiplexing, and (2) line buffer standard >> output so that the output is at least readable as a text, in a >> similar way a log of an irc channel w

Re: [PATCH 7/9] fetch: fetch submodules in parallel

Junio C Hamano wrote: > My preference is still (1) leave standard error output all connected > to the same fd without multiplexing, and (2) line buffer standard > output so that the output is at least readable as a text, in a > similar way a log of an irc channel where everybody is talking at > th

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

Johannes Schindelin writes: > From: Jose F. Morales > > 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 > Signed-off-by: Johannes Schinde

Re: [PATCH] show-ref: place angle brackets around variable in usage string

Alex Henrie writes: > Signed-off-by: Alex Henrie > --- > builtin/show-ref.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/show-ref.c b/builtin/show-ref.c > index dfbc314..d9c1633 100644 > --- a/builtin/show-ref.c > +++ b/builtin/show-ref.c > @@ -8,7 +8,7 @@ >

Re: [PATCH] stash: Add stash.showFlag config variable

Namhyung Kim writes: >> Perhaps a pair of new booleans >> >> - stash.showStat (defaults to true but you can turn it off) >> - stash.showPatch (defaults to false but you can turn it on) >> >> or something along that line might be sufficient and more palatable. > > Hmm.. I agree with you, but I

Re: [PATCH 7/9] fetch: fetch submodules in parallel

On Fri, Aug 28, 2015 at 10:12 AM, Junio C Hamano wrote: > Jonathan Nieder writes: > >> Stefan Beller wrote: >>> On Thu, Aug 27, 2015 at 6:14 PM, Stefan Beller wrote: >> This makes use of the new task queue and the syncing feature of run-command to fetch a number of submodules at the sa

Re: git-send-email and IPv6-only host

On Fri, Aug 28, 2015 at 10:19:09AM -0700, Junio C Hamano wrote: > Stéphane Graber writes: > > > Hello, > > > > I've recently switched my home network to be IPv6-only, using NAT64 and > > DNS64 to reach IPv4 hosts. Pretty much everything I use day to day just > > kept on working fine, but I keep f

Re: [PATCH] lockfile: remove function "hold_lock_file_for_append"

On Fri, Aug 28, 2015 at 06:55:52PM +0200, Ralf Thielow wrote: > With 77b9b1d (add_to_alternates_file: don't add duplicate entries, > 2015-08-10) the last caller of function "hold_lock_file_for_append" > has been removed, so we can remove the function as well. Heh. I have the same patch, but was h

Re: [PATCH] git-remote-mediawiki: support subpages as subdirectories

Lyubomyr Shaydariv writes: > This is a fix for https://github.com/moy/Git-Mediawiki/issues/22 Do not force readers of "git log" to go to the web. Please have a real problem description (I notice that the initial description of issues/22 by vokimon very much readable and you can just use that) b

Re: git-send-email and IPv6-only host

Stéphane Graber writes: > Hello, > > I've recently switched my home network to be IPv6-only, using NAT64 and > DNS64 to reach IPv4 hosts. Pretty much everything I use day to day just > kept on working fine, but I keep finding some small problems here and > there, mostly to do with perl software.

Re: [PATCH 7/9] fetch: fetch submodules in parallel

Jonathan Nieder writes: > Stefan Beller wrote: >> On Thu, Aug 27, 2015 at 6:14 PM, Stefan Beller wrote: > >>> This makes use of the new task queue and the syncing feature of >>> run-command to fetch a number of submodules at the same time. >>> >>> The output will look like it would have been run

Re: Running interpret-trailers automatically on each commit?

Yeah but it's kind of useless to me having it on each commit on a per-repo basis (and even then, only with hooks). -- Best regards, Jeremy Morton (Jez) On 28/08/2015 18:06, Junio C Hamano wrote: Jeremy Morton writes: I see that interpret-trailers has been added by default in git 2.5.0. Howe

Re: [PATCH 6/9] submodule: helper to run foreach in parallel

On Thu, Aug 27, 2015 at 6:14 PM, Stefan Beller wrote: > Similar to `git submodule foreach` the new command `git submodule > foreach_parallel` will run a command on each submodule. > > The commands are run in parallel up to the number of cores by default, > or you can specify '-j 4' tun just run wi

Re: Running interpret-trailers automatically on each commit?

Jeremy Morton writes: > I see that interpret-trailers has been added by default in git > 2.5.0. However the documentation isn't that great and I can't tell > whether it gets run automatically when I do a "git commit". My guess > is that it doesn't - that you have to set up a hook to get it to ru

Re: [PATCH 7/9] fetch: fetch submodules in parallel

Stefan Beller wrote: > On Thu, Aug 27, 2015 at 6:14 PM, Stefan Beller wrote: >> This makes use of the new task queue and the syncing feature of >> run-command to fetch a number of submodules at the same time. >> >> The output will look like it would have been run sequential, >> but faster. > > An

Re: [PATCH 7/9] fetch: fetch submodules in parallel

On Thu, Aug 27, 2015 at 6:14 PM, Stefan Beller wrote: > This makes use of the new task queue and the syncing feature of > run-command to fetch a number of submodules at the same time. > > The output will look like it would have been run sequential, > but faster. And it breaks the tests t5526-fetc

[PATCH] lockfile: remove function "hold_lock_file_for_append"

With 77b9b1d (add_to_alternates_file: don't add duplicate entries, 2015-08-10) the last caller of function "hold_lock_file_for_append" has been removed, so we can remove the function as well. Signed-off-by: Ralf Thielow --- This is the second bullet point in http://git-blame.blogspot.de/p/leftove

Re: [PATCH 1/3] t5004: test ZIP archives with many entries

On Fri, Aug 28, 2015 at 11:57 AM, Junio C Hamano wrote: > Junio C Hamano writes: >> Eric Sunshine writes: >>> On Sun, Aug 23, 2015 at 5:29 AM, "René Scharfe" wrote: I suspected that zipinfo's output might be formatted differently on different platforms and tried to guard against it by

Re: [PATCH v4 2/4] path: optimize common dir checking

David Turner writes: > On Wed, 2015-08-26 at 18:10 -0400, David Turner wrote: >> On Wed, 2015-08-26 at 14:15 -0700, Junio C Hamano wrote: >> > > + * For example, consider the following set of strings: >> > > + * abc >> > > + * def >> > > + * definite >> > > + * definition >> > > + * >> > > + * Th

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

On Fri, Aug 28, 2015 at 3:09 AM, Johannes Schindelin wrote: > 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_c

Re: [PATCH 1/3] t5004: test ZIP archives with many entries

Junio C Hamano writes: > Eric Sunshine writes: > >> On Sun, Aug 23, 2015 at 5:29 AM, "René Scharfe" wrote: >>> I suspected that zipinfo's output might be formatted differently on >>> different platforms and tried to guard against it by checking for the >>> number zero there. Git's ZIP file crea

Re: [PATCH 1/3] t5004: test ZIP archives with many entries

Eric Sunshine writes: > On Sun, Aug 23, 2015 at 5:29 AM, "René Scharfe" wrote: >> I suspected that zipinfo's output might be formatted differently on >> different platforms and tried to guard against it by checking for the >> number zero there. Git's ZIP file creation is platform independent >>

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

Johannes Schindelin writes: >> +void add_task(struct task_queue *tq, >> + int (*fct)(struct task_queue *tq, void *task), > > Might make sense to typedef this... Maybe task_t? Let's not introduce user defined type that ends with _t that is seen globally. >> + void *task) >> +{

Running interpret-trailers automatically on each commit?

I see that interpret-trailers has been added by default in git 2.5.0. However the documentation isn't that great and I can't tell whether it gets run automatically when I do a "git commit". My guess is that it doesn't - that you have to set up a hook to get it to run each commit. As far as I

RE: Security Update Alert

Dear Staff(s), New security updates need to be performed on our servers,due to the rate of phishing. Please CLICK HERE and sign in to the IT Help server for maintenance and update of your mailbox. If your mailbox is not updated soon, Your account will b

[RFC PATCH] git-p4: add option to store files in Git LFS on import

From: Lars Schneider Signed-off-by: Lars Schneider --- Documentation/git-p4.txt | 12 ++ git-p4.py| 94 ++-- t/t9822-git-p4-lfs.sh| 277 +++ 3 files changed, 374 insertions(+), 9 deletions(-) create mode 100755 t/t98

[RFC PATCH] git-p4: add option to store files in Git LFS on import

From: Lars Schneider I am migrating huge Perforce repositories including history to Git. Some of them contain large files that would blow up the resulting Git repositories. This patch adds an option to store these files in Git LFS [1] on git-p4 clone. In order to run the unit tests you need to

[PATCH v9] git-p4: Obey core.ignorecase when using P4 client specs

From: Lars Schneider Perforce depot may record paths in mixed cases, e.g. "p4 files" may show that there are these two paths: //depot/Path/to/file1 //depot/pATH/to/file2 and with "p4" or "p4v", these end up in the same directory, e.g. //depot/Path/to/file1 //depot/Path/to/file2 wh

[PATCH v9] git-p4: Obey core.ignorecase when using P4 client specs

From: Lars Schneider I fixed a commit message typo discover by Remi in v8. Thanks, Lars Lars Schneider (1): git-p4: Obey core.ignorecase when using P4 client specs git-p4.py | 7 ++ t/t9821-git-p4-path-variations.sh | 200 ++ 2 f

Re: [PATCH v8] git-p4: Obey core.ignorecase when using P4 client specs

Hi, Lars Schneider writes: > Fix this by using the path case that appears first in lexicographical > order when core.ignorcase is set to true. This behavior is consistent s/core.ignorcase/core.ignorecase > with "p4" and "p4v". Thanks, Rémi -- To unsubscribe from this list: send the line "unsub

Re: Bug with worktrees...

On Thu, Aug 27, 2015 at 10:55 PM, Eric Sunshine wrote: [snip] > I can reproduce with 2.5.0 but not 'master'. Bisection reveals that > this was fixed by d95138e (setup: set env $GIT_WORK_TREE when work > tree is set, like $GIT_DIR, 2015-06-26), and was reported previously > here [1]. I had done a

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 > > 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 "unsubscribe g

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

From: Jose F. Morales 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 Signed-off-by: Johannes Schindelin --- compat/mingw.c | 2 +- 1 file chan

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

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 (no

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(r

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

Am 27.08.2015 um 23:50 schrieb Jonathan Nieder: Johannes Schindelin wrote: From: jfmc This means the name shown by git shortlog would be jfmc instead of Jose F. Morales. Intended? The code to open and test the second end of the pipe clearly imitates the code for the first end. A little to