Re: whither merge-tree?

2016-02-23 Thread Jeff King
On Tue, Feb 23, 2016 at 10:49:34AM +0100, Stefan Frühwirth wrote: > On 23.02.2016 at 06:02 Jeff King wrote: > >>Let's wait and see how many "please don't"s we hear, perhaps, before > >>deciding to go 3.? > > > >I'm guessing we won't see much either way. Even Stefan, the original > >reporter, does

Re: whither merge-tree?

2016-02-23 Thread Jeff King
On Wed, Feb 24, 2016 at 08:28:59AM +0100, Dennis Kaarsemaker wrote: > > So that's a "please don't" leave the code as-is but provide a  > > (transitional) solution that fixes the reported bug and has the best  > > chances of not causing any more headaches :) > > I am also actively using it. It's t

[PATCH 4/4] t5504: handle expected output from SIGPIPE death

2016-02-23 Thread Jeff King
Commit 8bf4bec (add "ok=sigpipe" to test_must_fail and use it to fix flaky tests, 2015-11-27) taught t5504 to handle "git push" racily exiting with SIGPIPE rather than failing. However, one of the tests checks the output of the command, as well. In the SIGPIPE case, we will not have produced any o

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

2016-02-23 Thread Sebastian Schuberth
On Wed, Feb 24, 2016 at 12:30 AM, Junio C Hamano wrote: > So, have we decided to wait, or we'd rather apply the band-aid in > the meantime? I can go either way, just double checking as I > noticed this thread while updating my leftover bits list. Thanks for the follow-up, I was about to ask for

[PATCH] git config: do not create .git/ if it does not exist yet

2016-02-23 Thread Johannes Schindelin
It is a pilot error to call `git config section.key value` outside of any Git worktree. Let's report that error instead of creating the .git/ directory and writing a fresh config into it. This addresses https://github.com/git-for-windows/git/issues/643 and https://groups.google.com/forum/#!topic/

[PATCH 3/4] test_must_fail: report number of unexpected signal

2016-02-23 Thread Jeff King
If a command is marked as test_must_fail but dies with a signal, we consider that a problem and report the error to stderr. However, we don't say _which_ signal; knowing that can make debugging easier. Let's share as much as we know. Signed-off-by: Jeff King --- Not necessary for the fix, obvious

[PATCH 2/4] fetch-pack: ignore SIGPIPE in sideband demuxer

2016-02-23 Thread Jeff King
If the other side feeds us a bogus pack, index-pack (or unpack-objects) may die early, before consuming all of its input. As a result, the sideband demuxer may get SIGPIPE (racily, depending on whether our data made it into the pipe buffer or not). If this happens and we are compiled with pthread s

[PATCH 1/4] write_or_die: handle EPIPE in async threads

2016-02-23 Thread Jeff King
When write_or_die() sees EPIPE, it treats it specially by converting it into a SIGPIPE death. We obviously cannot ignore it, as the write has failed and the caller expects us to die. But likewise, we cannot just call die(), because printing any message at all would be a nuisance during normal opera

[PATCH 0/4] robustifying t5504

2016-02-23 Thread Jeff King
I got a spurious test failure on t5504 while running the test suite today. This is the result of my quest through the SIGPIPE rabbit hole. Since this is not the first time I've investigated tests failing under load, I finally broke down and wrote a helper script. It probably needs some adapting fo

Re: whither merge-tree?

2016-02-23 Thread Dennis Kaarsemaker
On di, 2016-02-23 at 10:49 +0100, Stefan Frühwirth wrote: > On 23.02.2016 at 06:02 Jeff King wrote: > > > Let's wait and see how many "please don't"s we hear, perhaps, > > > before > > > deciding to go 3.? > > > > I'm guessing we won't see much either way. Even Stefan, the > > original > > reporte

Re: [PATCH 1/5] README: use markdown syntax

2016-02-23 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Feb 2016, Junio C Hamano wrote: > Matthieu Moy writes: > > > This allows repository browsers like GitHub to display the content of > > the file nicely formatted. > > > > Signed-off-by: Matthieu Moy > > --- > > To be honest, I have the most problem with this step in the wh

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Fengguang Wu
On Tue, Feb 23, 2016 at 10:30:04PM -0800, Junio C Hamano wrote: > Fengguang Wu writes: > > > The necessary lines for the robot are > > > > base commit: > > base patch-id: > > or > > base tree-id: > > base patch-id: > > I will not repeat why a commit object name wo

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Junio C Hamano
Fengguang Wu writes: > The necessary lines for the robot are > > base commit: > base patch-id: > or > base tree-id: > base patch-id: I will not repeat why a commit object name would be more appropriate than a tree object name here (please see my response to HPA).

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Junio C Hamano
"H. Peter Anvin" writes: > Personally, as a maintainer, I would love to see the tree ID and > ideally also the commit ID a series is based on. The commit ID is > in some ways less useful since it is non-recreatable (and > therefore will never match for anything but the first patch of a > series)

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Fengguang Wu
On Tue, Feb 23, 2016 at 12:35:12PM -0800, Junio C Hamano wrote: > ebied...@xmission.com (Eric W. Biederman) writes: > > > Junio C Hamano writes: > > > >> It is valuable for a testing organization to say "We tested this > >> series on top of version X. We know it works, we have tested on a > >> l

[PATCH] submodule: Try harder to fetch needed sha1 by direct fetching sha1

2016-02-23 Thread Stefan Beller
When reviewing a change in Gerrit, which also updates a submodule, a common review practice is to download and cherry-pick the patch locally to test it. However when testing it locally, the 'git submodule update' may fail fetching the correct submodule sha1 as the corresponding commit in the submod

[PATCHv15 2/5] run_processes_parallel: add LF when caller is sloppy

2016-02-23 Thread Stefan Beller
When the callers of parallel processing machine are sloppy with their messages, make sure the output is terminated with LF after one child process is handled. This will not mess with the internal state of the output, i.e. after all messages for one child process are process including the callbacks

[PATCHv15 4/5] submodule update: expose parallelism to the user

2016-02-23 Thread Stefan Beller
Expose possible parallelism either via the "--jobs" CLI parameter or the "submodule.fetchJobs" setting. By having the variable initialized to -1, we make sure 0 can be passed into the parallel processing machine, which will then pick as many parallel workers as there are CPUs. Signed-off-by: Stef

[PATCHv15 0/5] Expose submodule parallelism to the user

2016-02-23 Thread Stefan Beller
This build on top of 163b9b1f919c762a4bfb693b3aa05ef1aa627fee (origin/sb/submodule-parallel-update~3) and replaces the commits origin/sb/submodule-parallel-update~2.. * Renamed inspect_clone_next_submodule to prepare_to_clone_next_submodule and reordered the arguments thereof * Comments for th

[PATCHv15 3/5] git submodule update: have a dedicated helper for cloning

2016-02-23 Thread Stefan Beller
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 C

[PATCHv15 1/5] run-command: expose default_{start_failure, task_finished}

2016-02-23 Thread Stefan Beller
We want to reuse the error reporting facilities in a later patch. Signed-off-by: Stefan Beller --- run-command.c | 18 +- run-command.h | 19 +++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/run-command.c b/run-command.c index 51fd72c..d03ecaa 1

[PATCHv15 5/5] clone: allow an explicit argument for parallel submodule clones

2016-02-23 Thread Stefan Beller
Just pass it along to "git submodule update", which may pick reasonable defaults if you don't specify an explicit number. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- Documentation/git-clone.txt | 6 +- builtin/clone.c | 19 +-- t/t7406-submodu

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Fengguang Wu
On Tue, Feb 23, 2016 at 11:51:31AM -0800, Junio C Hamano wrote: > Fengguang Wu writes: > > >> >> I have a mixed feeling about this one, primarily because this was > >> >> already tried quite early in the life of "format-patch" command. > >> >> > >> >> > >> >> http://thread.gmane.org/gmane.c

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Fengguang Wu
On Tue, Feb 23, 2016 at 04:31:35PM +0300, Dan Carpenter wrote: > Blergh... You want it machine readable and I want it human readable. I Yeah. It's kind of tasting which may differ among people. I'll leave the judgments to Junio and others, and only add necessary comments to your points. > don't

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Fengguang Wu
Hi Eric, On Tue, Feb 23, 2016 at 01:56:07PM -0600, Eric W. Biederman wrote: > > Fengguag Wu, Xiaolong Ye, have you attempted to use the truncated > sha1 of the file the patch applies to? Git already places a file sha1 > at the top of a patch. See the index line? > > > diff --git a/fs/namespace

[PATCH v3 3/3] t3034: test deprecated interface

2016-02-23 Thread Felipe Gonçalves Assis
From: Felipe Gonçalves Assis --find-renames= and --rename-threshold= should be aliases. Signed-off-by: Felipe Gonçalves Assis --- t/t3034-merge-recursive-rename-options.sh | 46 +++ 1 file changed, 46 insertions(+) diff --git a/t/t3034-merge-recursive-rename-option

[PATCH v3 2/3] t3034: test option to disable renames

2016-02-23 Thread Felipe Gonçalves Assis
From: Felipe Gonçalves Assis Signed-off-by: Felipe Gonçalves Assis --- t/t3034-merge-recursive-rename-options.sh | 28 1 file changed, 28 insertions(+) diff --git a/t/t3034-merge-recursive-rename-options.sh b/t/t3034-merge-recursive-rename-options.sh index 51c2f87

[PATCH v3 0/3] Tests for merge-recursive rename-options

2016-02-23 Thread Felipe Gonçalves Assis
Just a quick update incorporating Eric's latest comments. Still based on c443d39 (merge-recursive: find-renames resets threshold, 2016-02-21). Felipe Gonçalves Assis (3): t3034: add rename threshold tests t3034: test option to disable renames t3034: test deprecated interface ...s.sh => t3

[PATCH v3 1/3] t3034: add rename threshold tests

2016-02-23 Thread Felipe Gonçalves Assis
From: Felipe Gonçalves Assis 10ae752 (merge-recursive: option to specify rename threshold, 2010-09-27) introduced this feature but did not include any tests. The tests use the new option --find-renames, which replaces the then introduced and now deprecated option --rename-threshold. Also update

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread H. Peter Anvin
On 02/23/2016 01:49 PM, Eric W. Biederman wrote: > > So I could really respect a patch header line that said: > tree abcdef0123456789...0123456789abcdef > > Where the numbers where the truncated tree hash before and after a patch > was applied. That would seem to give a little bit of extra sanit

Re: git "thin" submodule clone to feed "describe"

2016-02-23 Thread Martin Langhoff
On Tue, Feb 23, 2016 at 4:33 PM, Junio C Hamano wrote: > No, I do not think so. Thanks. I will probably setup a pre-commit hook at the top level project to update a submodule metadata file. Not the prettiest but... :-) m -- martin.langh...@gmail.com - ask interesting questions - don't ge

Re: [PATCH 1/3] t3034: add rename threshold tests

2016-02-23 Thread Felipe Gonçalves Assis
On 23 February 2016 at 21:50, Eric Sunshine wrote: > On Tue, Feb 23, 2016 at 6:48 PM, Felipe Gonçalves Assis > wrote: >> 10ae752 (merge-recursive: option to specify rename threshold, >> 2010-09-27) introduced this feature but did not include any tests. >> >> The tests use the new option --find-re

Re: Git History Rewriting in a public repository - capability to remove one or more commits from a public repository

2016-02-23 Thread Saravanan Shanmugham (sarvi)
Thanks Ilya and Stefan for your detailed responses. In general I am trying to avoid having to work with patch sets/queues. This may be acceptable as a replacement for the “testing-stage” repo. But we don’t want to have the developer deal with patches or patch queues in his workflow. 1. The devel

Re: [PATCH 1/3] t3034: add rename threshold tests

2016-02-23 Thread Eric Sunshine
On Tue, Feb 23, 2016 at 7:50 PM, Eric Sunshine wrote: > On Tue, Feb 23, 2016 at 6:48 PM, Felipe Gonçalves Assis > wrote: >> + if [ 50 -le "$th0" ]; then >> + check_50=check_threshold_0 >> + elif [ 50 -le "$th1" ]; then >> + check_50=check_threshold_1 >> +

Re: [PATCH 1/3] t3034: add rename threshold tests

2016-02-23 Thread Eric Sunshine
On Tue, Feb 23, 2016 at 6:48 PM, Felipe Gonçalves Assis wrote: > 10ae752 (merge-recursive: option to specify rename threshold, > 2010-09-27) introduced this feature but did not include any tests. > > The tests use the new option --find-renames, which replaces the then > introduced and now deprecat

[PATCH 3/3] t3034: test deprecated interface

2016-02-23 Thread Felipe Gonçalves Assis
From: Felipe Gonçalves Assis --find-renames= and --rename-threshold= should be aliases. Signed-off-by: Felipe Gonçalves Assis --- t/t3034-merge-recursive-rename-options.sh | 46 +++ 1 file changed, 46 insertions(+) diff --git a/t/t3034-merge-recursive-rename-option

[PATCH 1/3] t3034: add rename threshold tests

2016-02-23 Thread Felipe Gonçalves Assis
From: Felipe Gonçalves Assis 10ae752 (merge-recursive: option to specify rename threshold, 2010-09-27) introduced this feature but did not include any tests. The tests use the new option --find-renames, which replaces the then introduced and now deprecated option --rename-threshold. Also update

[PATCH 2/3] t3034: test option to disable renames

2016-02-23 Thread Felipe Gonçalves Assis
From: Felipe Gonçalves Assis Signed-off-by: Felipe Gonçalves Assis --- t/t3034-merge-recursive-rename-options.sh | 28 1 file changed, 28 insertions(+) diff --git a/t/t3034-merge-recursive-rename-options.sh b/t/t3034-merge-recursive-rename-options.sh index fbec68c

[PATCH v2 0/3] Tests for merge-recursive rename options

2016-02-23 Thread Felipe Gonçalves Assis
Get rid of blatant bash-isms in favour of simple and portable constructions. Felipe Gonçalves Assis (3): t3034: add rename threshold tests t3034: test option to disable renames t3034: test deprecated interface ...s.sh => t3032-merge-recursive-space-options.sh} | 2 +- t/t3034-merge-recur

Re: [PATCHv14 0/7] Expose submodule parallelism to the user

2016-02-23 Thread Junio C Hamano
Stefan Beller writes: > On Tue, Feb 23, 2016 at 3:33 PM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> Looks good. I didn't notice these unnecessary blank lines while >>> reading the previous rounds, and it is good to see them go. >>> >>> Let's wait for a few days and merge them to 'n

Re: [PATCHv14 0/7] Expose submodule parallelism to the user

2016-02-23 Thread Stefan Beller
On Tue, Feb 23, 2016 at 3:33 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Looks good. I didn't notice these unnecessary blank lines while >> reading the previous rounds, and it is good to see them go. >> >> Let's wait for a few days and merge them to 'next'. David's ref >> backend to

Re: [PATCHv14 0/7] Expose submodule parallelism to the user

2016-02-23 Thread Junio C Hamano
Junio C Hamano writes: > Looks good. I didn't notice these unnecessary blank lines while > reading the previous rounds, and it is good to see them go. > > Let's wait for a few days and merge them to 'next'. David's ref > backend topic textually depends on this, and we'd better give it a > solid

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

2016-02-23 Thread Junio C Hamano
Junio C Hamano writes: > Jeff King writes: > >> On Fri, Feb 12, 2016 at 10:40:48PM +0100, SZEDER Gábor wrote: >> >>> * It would swallow even those errors that we are interested in, >>>e.g. (note the missing quotes around $foo): >>> [...] >>> * I often find myself tracing/debugging the comp

Re: [PATCH] git-p4.py: Make submit working on bare repository

2016-02-23 Thread Amadeusz Żołnowski
Hi Luke, Luke Diamand writes: > I'm guessing that the reason for using a bare repo is so that changes > can be pushed to it from several different git repos. This then saves > doing the initial git-p4 clone multiple times. I have created a Git repository acting as a bridge between Perforce and p

Re: interactive rebase results across shared histories

2016-02-23 Thread Seb
On Tue, 23 Feb 2016 23:57:06 +0100, Moritz Neeb wrote: [...] >> OK, I've followed this advice and looked at the dependency graphs in >> gitk before and after rebasing, I've managed to obtain what I was >> after. The repository now has two branches: master and topic. >> However, Gitk reveals a p

Re: interactive rebase results across shared histories

2016-02-23 Thread Kevin Daudt
On Tue, Feb 23, 2016 at 11:57:06PM +0100, Moritz Neeb wrote: > On 02/23/2016 06:39 PM, Seb wrote: > > On Sun, 21 Feb 2016 03:12:49 +0100, > > Moritz Neeb wrote: > > > >> Hi Seb, > >> On 02/20/2016 11:58 PM, Seb wrote: > >>> Hello, > > > >>> I've recently learnt how to consolidate and clean up th

Re: [PATCH 1/2] t8005: avoid grep on non-ASCII data

2016-02-23 Thread Junio C Hamano
John Keeping writes: > My original sed version was: > > sed -ne "/^author /p" -e "/^summary /p" > > which I think will work on all platforms (we already use it in > t-basic.sh) but then I decided to be too clever :-( > > I still think sed is simpler than introducing a new function to wr

Re: interactive rebase results across shared histories

2016-02-23 Thread Moritz Neeb
On 02/23/2016 06:39 PM, Seb wrote: > On Sun, 21 Feb 2016 03:12:49 +0100, > Moritz Neeb wrote: > >> Hi Seb, >> On 02/20/2016 11:58 PM, Seb wrote: >>> Hello, > >>> I've recently learnt how to consolidate and clean up the master >>> branch's commit history. I've squashed/fixuped many commits think

Re: [PATCH 2/2] t9200: avoid grep on non-ASCII data

2016-02-23 Thread Junio C Hamano
Jeff King writes: > On Sun, Feb 21, 2016 at 11:43:45PM +, John Keeping wrote: > >> On Sun, Feb 21, 2016 at 04:15:31PM -0500, Eric Sunshine wrote: >> > On Sun, Feb 21, 2016 at 12:32 PM, John Keeping wrote: >> > > GNU grep 2.23 detects the input used in this test as binary data so it >> > > do

git-rebase + git-mergetool results in broken state

2016-02-23 Thread Joe Einertson
I'm experiencing an annoying issue which leaves the repository in a weird, broken state. I am attempting a rather vanilla rebase, rebasing the commits from a feature branch on top of the newest commits on master. So, I run a typical series of commands: 1. git checkout feature-branch 2. git rebase

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Stefan Beller
On Tue, Feb 23, 2016 at 12:46 PM, H. Peter Anvin wrote: > On February 23, 2016 12:35:12 PM PST, Junio C Hamano > wrote: >>ebied...@xmission.com (Eric W. Biederman) writes: >> >>> Junio C Hamano writes: >>> It is valuable for a testing organization to say "We tested this series on top

Re: Git History Rewriting in a public repository - capability to remove one or more commits from a public repository

2016-02-23 Thread Ilya Terentyev
Hi Saravanan, Changes that rewrite history, including (but not limited to) deleted commits, can be pushed with the --force or --force-with-lease options, like this: $ git push --force remote branch --force pushes your changes unconditionally, which may overwrite changes that someone else

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Eric W. Biederman
"H. Peter Anvin" writes: > On February 23, 2016 12:35:12 PM PST, Junio C Hamano > wrote: >>ebied...@xmission.com (Eric W. Biederman) writes: >> >>> Junio C Hamano writes: >>> It is valuable for a testing organization to say "We tested this series on top of version X. We know it work

Re: Git History Rewriting in a public repository - capability to remove one or more commits from a public repository

2016-02-23 Thread Stefan Beller
On Tue, Feb 23, 2016 at 1:30 PM, Saravanan Shanmugham (sarvi) wrote: > > > Hi Git Leads, > I am looking for git capability/way to be able to remove commits > from a public repository. > > Background: > We are looking for a multi-stage commit process where commits get pushed > into a public ³

Re: [PATCH 0/5] activate diff.renames by default

2016-02-23 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> Matthieu Moy writes: >> >>> I have always wondered why diff.renames was not activated by default. >>> I've had it to true in my configuration for 9 years, and I've been >>> teaching newbies to set it for a while without issue. I think it's >>>

Re: [PATCH 4/5] README.md: don't call git stupid in the title

2016-02-23 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> Having said that, I agree with the spirit of 4/5 and 5/5; but it is >> sad that this line is not resurrected by 5/5 in some way. > > Do you mean something like this: > > diff --git a/README.md b/README.md > index 40de78e..b1c89bd 100644 > --- a/

Re: git "thin" submodule clone to feed "describe"

2016-02-23 Thread Junio C Hamano
Martin Langhoff writes: > Hi git list! long time no see! :-) Been missing you lots. > > Do we currently have any means to clone _history_ but not _blobs_ of a > repo, or some approximation thereof? > > With a bit more context: If I have a top-level project using a couple > dozen submodules, where

Git History Rewriting in a public repository - capability to remove one or more commits from a public repository

2016-02-23 Thread Saravanan Shanmugham (sarvi)
Hi Git Leads, I am looking for git capability/way to be able to remove commits from a public repository. Background: We are looking for a multi-stage commit process where commits get pushed into a public ³testing-stage² repository. Where we do testing of commits before they are pushed to a

Re: [PATCH 5/5] diff: activate diff.renames by default

2016-02-23 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> diff --git a/builtin/log.c b/builtin/log.c >> index 7f96c64..6e34df3 100644 >> --- a/builtin/log.c >> +++ b/builtin/log.c >> @@ -103,6 +103,7 @@ static int log_line_range_callback(const struct option >> *option, const char *arg, >> static void

Re: [PATCH 3/3] credential-cache--daemon: change to the socket dir on startup

2016-02-23 Thread Jeff King
On Tue, Feb 23, 2016 at 01:09:44PM -0800, Junio C Hamano wrote: > I tentatively squashed this, which I think reads better. > > diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c > index 9a3a7a3..6b00ee0 100644 > --- a/credential-cache--daemon.c > +++ b/credential-cache--daemon.c

Re: [PATCH 3/3] credential-cache--daemon: change to the socket dir on startup

2016-02-23 Thread Junio C Hamano
Jeff King writes: > On Tue, Feb 23, 2016 at 01:06:10PM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > + /* >> > + * We don't actually care what our cwd is; we chdir here just to >> > + * be a friendly daemon and avoid tying up our original cwd. >> > + * If this fails, it's O

Re: [PATCH 3/3] credential-cache--daemon: change to the socket dir on startup

2016-02-23 Thread Jeff King
On Tue, Feb 23, 2016 at 01:06:10PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > + /* > > +* We don't actually care what our cwd is; we chdir here just to > > +* be a friendly daemon and avoid tying up our original cwd. > > +* If this fails, it's OK to just continue withou

Re: [PATCH 3/3] credential-cache--daemon: change to the socket dir on startup

2016-02-23 Thread Junio C Hamano
Jeff King writes: > + /* > + * We don't actually care what our cwd is; we chdir here just to > + * be a friendly daemon and avoid tying up our original cwd. > + * If this fails, it's OK to just continue without that benefit. > + */ > + chdir(dir); I fully do agree wit

[PATCH] Documentation/git-push: document that 'simple' is the default

2016-02-23 Thread Matthieu Moy
The default behavior is well documented already in git-config(1), but git-push(1) itself did not mention it at all. For users willing to learn how "git push" works but not how to configure it, this makes the documentation cumbersome to read. Make the git-push(1) page self-contained by adding a sho

git "thin" submodule clone to feed "describe"

2016-02-23 Thread Martin Langhoff
Hi git list! long time no see! :-) Been missing you lots. Do we currently have any means to clone _history_ but not _blobs_ of a repo, or some approximation thereof? With a bit more context: If I have a top-level project using a couple dozen submodules, where the submodules are huge, do I have a

Re: [PATCH] push: shorten "push.default is unset" warning message

2016-02-23 Thread Matthieu Moy
"Philip Oakley" writes: > Shouldn't this also update the 'push' man page to state what the new > default is. @gerry's comment to the top answer > http://stackoverflow.com/a/13148313/717355 highlights that the word > 'simple' is not even mentioned in the 'push' man page. This is more or less a di

Re: [PATCH 5/5] diff: activate diff.renames by default

2016-02-23 Thread Junio C Hamano
Matthieu Moy writes: > diff --git a/builtin/log.c b/builtin/log.c > index 7f96c64..6e34df3 100644 > --- a/builtin/log.c > +++ b/builtin/log.c > @@ -103,6 +103,7 @@ static int log_line_range_callback(const struct option > *option, const char *arg, > static void init_log_defaults() > { > i

Re: git diff HEAD^(255) fails

2016-02-23 Thread Kevin Daudt
On Sat, Feb 06, 2016 at 10:56:46PM +0100, Ole Tange wrote: > git diff first looks for a file, then looks if it is a reference to a > revision. If the file fails due to being too long, the diff fails: > > $ git init > $ git diff > 'HEAD^^

Re: [PATCH v2 1/1] convert.c: correct attr_action

2016-02-23 Thread Junio C Hamano
tbo...@web.de writes: > From: Torsten Bögershausen > > Commit "convert.c: refactor crlf_action" unified the crlf_handling > and introdused a bug for "git ls-files --eol". > The "text" attribute was shown as "text eol=lf" or "text eol=crlf", > depending on core.autpcrlf or core.eol. > Correct this

Re: [PATCH 4/5] README.md: don't call git stupid in the title

2016-02-23 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> "the stupid content tracker" was true in the early days of Git, but >> hardly applicable these days. "fast, scalable, distributed" describes >> Git more accuralety. >> >> Also, "stupid" can be seen as offensive by some people. Let's not use it >

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread H. Peter Anvin
On February 23, 2016 12:35:12 PM PST, Junio C Hamano wrote: >ebied...@xmission.com (Eric W. Biederman) writes: > >> Junio C Hamano writes: >> >>> It is valuable for a testing organization to say "We tested this >>> series on top of version X. We know it works, we have tested on a >>> lot more ha

Re: [PATCH 0/5] activate diff.renames by default

2016-02-23 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> I have always wondered why diff.renames was not activated by default. >> I've had it to true in my configuration for 9 years, and I've been >> teaching newbies to set it for a while without issue. I think it's >> time to activate it by default,

Re: [PATCH] push: shorten "push.default is unset" warning message

2016-02-23 Thread Philip Oakley
From: "Matthieu Moy" From: Matthieu Moy The warning was purposely long, both to explain the situation properly and to give a strong incentive to set push.default explicitly. This was important before the 2.0 transition, and remained important for a while after, so that new users get push.defau

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Junio C Hamano
ebied...@xmission.com (Eric W. Biederman) writes: > Junio C Hamano writes: > >> It is valuable for a testing organization to say "We tested this >> series on top of version X. We know it works, we have tested on a >> lot more hardware than the original developer had, we know this is >> good to g

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Eric W. Biederman
Junio C Hamano writes: > Fengguang Wu writes: > >>> >> I have a mixed feeling about this one, primarily because this was >>> >> already tried quite early in the life of "format-patch" command. >>> >> >>> >> >>> >> http://thread.gmane.org/gmane.comp.version-control.git/9694/focus=9757 >>> >

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Eric W. Biederman
Fengguag Wu, Xiaolong Ye, have you attempted to use the truncated sha1 of the file the patch applies to? Git already places a file sha1 at the top of a patch. See the index line? > diff --git a/fs/namespace.c b/fs/namespace.c > index eccd925c6e82..3c3f8172c734 100644 > --- a/fs/namespace.c > ++

Re: [PATCH 2/5] README.md: add hyperlinks on filenames

2016-02-23 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Signed-off-by: Matthieu Moy >> --- >> README.md | 19 +-- >> 1 file changed, 13 insertions(+), 6 deletions(-) > > Makes sense, provided if we want to do Markdown. I'd say it the other way around: declaring README as markdown c

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

2016-02-23 Thread Junio C Hamano
Fengguang Wu writes: >> >> I have a mixed feeling about this one, primarily because this was >> >> already tried quite early in the life of "format-patch" command. >> >> >> >> http://thread.gmane.org/gmane.comp.version-control.git/9694/focus=9757 >> >> >> >> Only the name is different (it w

Re: [PATCH 1/5] README: use markdown syntax

2016-02-23 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> This allows repository browsers like GitHub to display the content of >> the file nicely formatted. >> >> Signed-off-by: Matthieu Moy >> --- > > To be honest, I have the most problem with this step in the whole > series. > > Markdown when rende

Re: [PATCH] push: shorten "push.default is unset" warning message

2016-02-23 Thread Matthieu Moy
Junio C Hamano writes: > The punchline of that question is: > > I can obviously set it to one of the values mentioned, but what do > they mean? What's the difference between simple and matching? > > It tells us that "See 'git help config'" is not such an effective > message to help such a

Re: [PATCH 0/5] activate diff.renames by default

2016-02-23 Thread Junio C Hamano
Matthieu Moy writes: > I have always wondered why diff.renames was not activated by default. > I've had it to true in my configuration for 9 years, and I've been > teaching newbies to set it for a while without issue. I think it's > time to activate it by default, but please let me know if I miss

Re: [PATCH 4/5] README.md: don't call git stupid in the title

2016-02-23 Thread Junio C Hamano
Matthieu Moy writes: > "the stupid content tracker" was true in the early days of Git, but > hardly applicable these days. "fast, scalable, distributed" describes > Git more accuralety. > > Also, "stupid" can be seen as offensive by some people. Let's not use it > in the very first words of the R

Re: [PATCH 2/5] README.md: add hyperlinks on filenames

2016-02-23 Thread Junio C Hamano
Matthieu Moy writes: > Signed-off-by: Matthieu Moy > --- > README.md | 19 +-- > 1 file changed, 13 insertions(+), 6 deletions(-) Makes sense, provided if we want to do Markdown. If I were pushing this topic (i.e. cater to those who browse at GitHub, not with "less" in the sou

Re: [PATCH 1/5] README: use markdown syntax

2016-02-23 Thread Junio C Hamano
Matthieu Moy writes: > This allows repository browsers like GitHub to display the content of > the file nicely formatted. > > Signed-off-by: Matthieu Moy > --- To be honest, I have the most problem with this step in the whole series. Markdown when rendered may be easier to read, but plain text

Re: [PATCH] push: shorten "push.default is unset" warning message

2016-02-23 Thread Junio C Hamano
Matthieu Moy writes: > The warning is mostly seen by beginners, who have not set their > push.default configuration (yet). For many of them, the warning is > confusing because it talks about concepts that they have not learned and > asks them a choice that they are not able to make yet. See for e

Invalid initial git gui message encoding

2016-02-23 Thread jarek z.
Hello. Working with Git for Windows on git gui I noticed an issue on reading initial message to git gui message prompt. Steps to reproduce: git init . echo 'a' > a && git add . && git commit -m 'added A' git checkout -b devel echo 'b' > b && git add . && git commit -m 'added B (ęóąśłżźćń

Re: [PATCH v5 23/27] svn: learn ref-storage argument

2016-02-23 Thread David Turner
On Sat, 2016-02-20 at 23:55 +, Eric Wong wrote: > David Turner wrote: > > +++ b/git-svn.perl > > > + if (defined $_ref_storage) { > > + push @init_db, "--ref-storage=" . > > $_ref_storage; > > + } > > Minor nit: git-svn uses tabs for indentation. > Otherwise

[PATCH 5/5] diff: activate diff.renames by default

2016-02-23 Thread Matthieu Moy
Rename detection is a very convenient feature, and new users shouldn't have to dig in the documentation to benefit from it. Potential objections to activating rename detection are that it sometimes fail, and it is sometimes slow. But rename detection is already activated by default in several case

[PATCH 2/5] t4001-diff-rename: wrap file creations in a test

2016-02-23 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- t/t4001-diff-rename.sh | 38 +- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 2f327b7..bfb364c 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.

[PATCH 4/5] log: introduce init_log_defaults()

2016-02-23 Thread Matthieu Moy
This is currently a wrapper around init_grep_defaults(), but will allow adding more initialization in further patches. Signed-off-by: Matthieu Moy --- builtin/log.c | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 0d738d6..7

[PATCH 1/5] Documentation/diff-config: fix description of diff.renames

2016-02-23 Thread Matthieu Moy
The description was misleading, since "set to any boolean value" include "set to false", and diff.renames=false does not enable basic detection, but actually disables it. Signed-off-by: Matthieu Moy --- Documentation/diff-config.txt | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) d

[PATCH 3/5] t: add tests for diff.renames (true/false/unset)

2016-02-23 Thread Matthieu Moy
The underlying machinery is well-tested, but the configuration option itself was tested only in t3400-rebase.sh. Signed-off-by: Matthieu Moy --- t/t4001-diff-rename.sh | 61 +- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/t/t4001-d

[PATCH 0/5] activate diff.renames by default

2016-02-23 Thread Matthieu Moy
I have always wondered why diff.renames was not activated by default. I've had it to true in my configuration for 9 years, and I've been teaching newbies to set it for a while without issue. I think it's time to activate it by default, but please let me know if I missed a reason to keep it to false

[PATCH 4/5] README.md: don't call git stupid in the title

2016-02-23 Thread Matthieu Moy
"the stupid content tracker" was true in the early days of Git, but hardly applicable these days. "fast, scalable, distributed" describes Git more accuralety. Also, "stupid" can be seen as offensive by some people. Let's not use it in the very first words of the README. The new formulation is tak

[PATCH 5/5] README.md: move down historical explanation about the name

2016-02-23 Thread Matthieu Moy
The explanations about why the name was chosen are secondary compared to the description and link to the documentation. Some consider these explanations as good computer scientists joke, but other see it as needlessly offensive vocabulary. This patch preserves the historical joke, but gives it le

[RFC/PATCH 0/5] Make README more pleasant to read

2016-02-23 Thread Matthieu Moy
This patch series was inspired by a discussion I had with Emma Jane after Git Merge last year. It tries both to make the README file less agressive and generally more pleasant to read. To get a quick overview, compare the old one: https://github.com/git/git#readme and my proposal: https://g

[PATCH 2/5] README.md: add hyperlinks on filenames

2016-02-23 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- README.md | 19 +-- 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 907eb3b..750fdda 100644 --- a/README.md +++ b/README.md @@ -20,17 +20,17 @@ License version 2 (some parts of it are under different licen

Re: interactive rebase results across shared histories

2016-02-23 Thread Seb
On Sun, 21 Feb 2016 03:12:49 +0100, Moritz Neeb wrote: > Hi Seb, > On 02/20/2016 11:58 PM, Seb wrote: >> Hello, >> I've recently learnt how to consolidate and clean up the master >> branch's commit history. I've squashed/fixuped many commits thinking >> these would propagate to the children bra

[PATCH 1/5] README: use markdown syntax

2016-02-23 Thread Matthieu Moy
This allows repository browsers like GitHub to display the content of the file nicely formatted. Signed-off-by: Matthieu Moy --- README => README.md | 6 +- t/t7001-mv.sh | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) rename README => README.md (93%) diff --git a/README b/R

[PATCH 3/5] README.md: move the link to git-scm.com up

2016-02-23 Thread Matthieu Moy
The documentation available on git-scm.com is nicely formatted. It's better to point users to it than to the source code of the documentation. Signed-off-by: Matthieu Moy --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 750fdda..

  1   2   >