[PATCH 5/6] fsmonitor: Remove debugging lines from t/t7519-status-fsmonitor.sh

2017-12-18 Thread Alex Vandiver
These were mistakenly left in when the test was introduced, in 1487372d3 ("fsmonitor: store fsmonitor bitmap before splitting index", 2017-11-09) Signed-off-by: Alex Vandiver --- t/t7519-status-fsmonitor.sh | 2 -- 1 file changed, 2 deletions(-) diff --git

[PATCH 6/6] fsmonitor: Use fsmonitor data in `git diff`

2017-12-18 Thread Alex Vandiver
With fsmonitor enabled, the first call to match_stat_with_submodule calls refresh_fsmonitor, incurring the overhead of reading the list of updated files -- but run_diff_files does not respect the CE_FSMONITOR_VALID flag. Make use of the fsmonitor extension to skip lstat() calls on files that

Re: [FYI PATCH] t/helper/test-lazy-name-hash: fix compilation

2017-12-18 Thread Jonathan Tan
On Mon, 18 Dec 2017 13:49:47 -0800 Stefan Beller wrote: > I was compiling origin/master today with stricter compiler flags today > and was greeted by > > t/helper/test-lazy-init-name-hash.c: In function ‘cmd_main’: > t/helper/test-lazy-init-name-hash.c:172:5: error:

Did you get my message this time?

2017-12-18 Thread Friedrich Mayrhofer
-- This is the second time. I, Friedrich Mayrhofer Donate $ 1,000,000.00 to You, Email Me personally for more details. Regards. Friedrich Mayrhofer

Bug with "git submodule update" + subrepo with differing path/name?

2017-12-18 Thread Andreas Urke
Hi, I have a repo with two submodules. I regularly use "git submodule update", which works fine for one subrepo, but not for the other. The only relevant difference I can think of between these two subrepos is that the latter one does not have a matching path and name: $ cat .gitmodules

Re: [PATCH v2 1/3] repository: fix repo_read_index with submodules

2017-12-18 Thread Brandon Williams
On 12/18, Thomas Gummerer wrote: > On 12/18, Brandon Williams wrote: > > On 12/17, Thomas Gummerer wrote: > > > repo_read_index calls read_index_from, which takes an path argument for > > > the location of the index file. For the split index however it relies > > > > > on the current working

Re: [PATCH v2 1/3] repository: fix repo_read_index with submodules

2017-12-18 Thread Thomas Gummerer
On 12/18, Brandon Williams wrote: > On 12/17, Thomas Gummerer wrote: > > repo_read_index calls read_index_from, which takes an path argument for > > the location of the index file. For the split index however it relies > > > on the current working directory to construct the path using git_path.

Re: [PATCH v2 6/8] travis-ci: don't install 'language-pack-is' package

2017-12-18 Thread Junio C Hamano
Lars Schneider writes: >> It seems we would loose coverage with this patch, so it should be >> dropped. > > Yeah. I think we should add a comment to the travis.yml to avoid > future confusion. I'll do it unless you beat me to it with a re-roll. Rather, it should be

Re: [PATCH v3] imap-send: URI encode server folder

2017-12-18 Thread Junio C Hamano
Kaartic Sivaraam writes: > From: Nicolas Morey-Chaisemartin > > When trying to send a patch using 'imap-send' with 'curl' and the > following configuration: > > [imap] > folder = "[Gmail]/Drafts" > host =

Re: [PATCH v3] imap-send: URI encode server folder

2017-12-18 Thread Jonathan Nieder
Kaartic Sivaraam wrote: > From: Nicolas Morey-Chaisemartin > > When trying to send a patch using 'imap-send' with 'curl' and the > following configuration: > > [imap] > folder = "[Gmail]/Drafts" > host = imaps://imap.gmail.com > port = 993 >

Re: [PATCH v2 6/8] travis-ci: don't install 'language-pack-is' package

2017-12-18 Thread Lars Schneider
> On 18 Dec 2017, at 23:04, SZEDER Gábor wrote: > > On Mon, Dec 18, 2017 at 10:33 PM, Lars Schneider > wrote: >> >>> On 16 Dec 2017, at 13:57, SZEDER Gábor wrote: >>> >>> Ever since we have started to use Travis CI in

[ANNOUNCE] tig-2.3.2

2017-12-18 Thread Jonas Fonseca
Hello, A regression in 2.3.1 related with the detection of busy loops has been fixed in version 2.3.2. Release notes - Bug fixes: - Fix busy loop detection to handle large repos. (GH #164) Change summary -- The diffstat and log summary for changes made in this release.

Re: [PATCH v2 6/8] travis-ci: don't install 'language-pack-is' package

2017-12-18 Thread SZEDER Gábor
On Mon, Dec 18, 2017 at 10:33 PM, Lars Schneider wrote: > >> On 16 Dec 2017, at 13:57, SZEDER Gábor wrote: >> >> Ever since we have started to use Travis CI in 522354d70 (Add Travis >> CI support, 2015-11-27), our 64 bit Linux build jobs install

Re: [PATCH v1] convert: add support for 'encoding' attribute

2017-12-18 Thread Johannes Sixt
Am 18.12.2017 um 11:13 schrieb Torsten Bögershausen: Just to confirm my missing knowledge here: Does this mean, that git-gui and gitk can decode/reencode the content of a file/blob, when the .gitattributes say so ? No. I think they parse the output of git-diff et.al., split it per file, and

Re: [PATCH v2 1/8] travis-ci: use 'set -x' in select 'ci/*' scripts for extra tracing

2017-12-18 Thread Lars Schneider
> On 16 Dec 2017, at 13:54, SZEDER Gábor wrote: > > While the build logic was embedded in our '.travis.yml', Travis CI > used to produce a nice trace log including all commands executed in > those embedded scriptlets. Since 657343a60 (travis-ci: move Travis CI > code into

[FYI PATCH] t/helper/test-lazy-name-hash: fix compilation

2017-12-18 Thread Stefan Beller
I was compiling origin/master today with stricter compiler flags today and was greeted by t/helper/test-lazy-init-name-hash.c: In function ‘cmd_main’: t/helper/test-lazy-init-name-hash.c:172:5: error: ‘nr_threads_used’ may be used uninitialized in this function [-Werror=maybe-uninitialized]

Re: [PATCH v2 0/8] Travis CI cleanups

2017-12-18 Thread Lars Schneider
> On 16 Dec 2017, at 13:54, SZEDER Gábor wrote: > > This is a reroll of 'sg/travis-fixes'. > > Changes since the previous round: > > - Patch 1 got updated following the discussion: > > - I went with enabling tracing executed commands everywhere, > including the

Re: commit-msg hook possible bad behavior with -F

2017-12-18 Thread Seth Raymond
I see that line of thinking, and agree that it makes sense. I'm having problems with an IDE (Qt Creator) and I think I know where the problem lies now. I believe Qt Creator doesn't actually call git commit until after the user generates a message in the message box, meaning my prepare-commit-msg

Re: [PATCH v2 6/8] travis-ci: don't install 'language-pack-is' package

2017-12-18 Thread Lars Schneider
> On 16 Dec 2017, at 13:57, SZEDER Gábor wrote: > > Ever since we have started to use Travis CI in 522354d70 (Add Travis > CI support, 2015-11-27), our 64 bit Linux build jobs install the > 'languate-pack-is' package. That commit doesn't discuss why it was > deemed

Did you get my message this time?

2017-12-18 Thread Friedrich Mayrhofer
-- This is the second time. I, Friedrich Mayrhofer Donate $ 1,000,000.00 to You, Email Me personally for more details. Regards. Friedrich Mayrhofer

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

2017-12-18 Thread Jacob Keller
On Sun, Dec 17, 2017 at 10:40 PM, Jeff King wrote: > On Sun, Dec 17, 2017 at 08:03:41PM -0800, Jacob Keller wrote: > >> I do find it a bit weird that --global writes to one of either file, >> and doesn't read from both. I'd rather have --global "only" be >> .gitconfig, and instead

Re: [PATCH] fmt-merge-msg: avoid leaking strbuf in shortlog()

2017-12-18 Thread René Scharfe
Am 08.12.2017 um 22:28 schrieb Jeff King: > On Fri, Dec 08, 2017 at 10:37:08AM -0800, Junio C Hamano wrote: > >>> The two modes (dup/nodup) make string_list code tricky. Not sure >>> how far we'd get with something simpler (e.g. an array of char pointers), >>> but having the caller do all string

Re: [PATCH] revision: introduce prepare_revision_walk_extended()

2017-12-18 Thread René Scharfe
Am 18.12.2017 um 16:10 schrieb Jeff King: > On Sat, Dec 16, 2017 at 01:12:16PM +0100, René Scharfe wrote: > >> prepare_revision_walk() allows callers to take ownership of the array of >> pending objects by setting the rev_info flag "leak_pending" and copying >> the object_array "pending". They

[PATCH v3] imap-send: URI encode server folder

2017-12-18 Thread Kaartic Sivaraam
From: Nicolas Morey-Chaisemartin When trying to send a patch using 'imap-send' with 'curl' and the following configuration: [imap] folder = "[Gmail]/Drafts" host = imaps://imap.gmail.com port = 993 sslverify = false results in the

Re: Usability issue with rebase fork-point option

2017-12-18 Thread Junio C Hamano
Robert Dailey writes: > $ git rebase > First, rewinding head to replay your work on top of it... > Applying: Fix state machine hang after integrity checking > > Since my merge-base is already the tip of `origin/master`, I expected > it to say it was up-to-date, as it

Re: [PATCH v2] imap-send: URI encode server folder

2017-12-18 Thread Eric Sunshine
On Mon, Dec 18, 2017 at 1:25 PM, Kaartic Sivaraam wrote: > From: Nicolas Morey-Chaisemartin > [...] > resulted in the following error, s/resulted/results/ > curl_easy_perform() failed: URL using bad/illegal format or missing URL > >

Re: 'git format-patch --summary' seems to be turning off the stat

2017-12-18 Thread Kaartic Sivaraam
On Tuesday 19 December 2017 12:07 AM, Junio C Hamano wrote: Kaartic Sivaraam writes: Note: I do see that "--summary" is a diff-option but does that mean we should't be printing stat information in the patch when the user didn't mention "--no-stat"? Yeah, "git

Re: Fetching commit instead of ref

2017-12-18 Thread Junio C Hamano
"Carlsson, Magnus" writes: > > So far so good, but then an error message appear: > error: Server does not allow request for unadvertised object > 50f730db793e0733b159326c5a3e78fd48cedfec > > And nothing seems to be fetched. Yes, that is what the error message

Re: 'git format-patch --summary' seems to be turning off the stat

2017-12-18 Thread Junio C Hamano
Kaartic Sivaraam writes: > Note: I do see that "--summary" is a diff-option but does that mean we > should't be printing stat information in the patch when the user > didn't mention "--no-stat"? Yeah, "git format-patch --summary > --stat" does bring back the stat.

Re: commit-msg hook possible bad behavior with -F

2017-12-18 Thread Eric Sunshine
On Mon, Dec 18, 2017 at 11:43 AM, Seth Raymond wrote: > If a commit is invoked with -F , indicating that the commit > message should be read from an existing file, the the > prepare-commit-msg and commit-msg hooks do not operate on . The > first argument to the hook is

[PATCH v2] imap-send: URI encode server folder

2017-12-18 Thread Kaartic Sivaraam
From: Nicolas Morey-Chaisemartin When trying to send a patch using 'imap-send' with 'curl' and the following configuration: [imap] folder = "[Gmail]/Drafts" host = imaps://imap.gmail.com port = 993 sslverify = false resulted in the

Re: Apparent bug in 'git stash push ' loses untracked files

2017-12-18 Thread Junio C Hamano
Thomas Gummerer writes: > Ah interesting, what you have below looks good to me indeed, it > matches what I'd expect it to do and fixes the bug that was reported. > Thanks! > > I've taken the liberty to take what you have below and turned into a > proper patch, giving you

Re: Fetching commit instead of ref

2017-12-18 Thread Stefan Beller
On Mon, Dec 18, 2017 at 4:30 AM, Carlsson, Magnus wrote: > Hi > > I am involved in the git-subrepo project > (https://github.com/ingydotnet/git-subrepo/). It's an attempt to simplify the > inclusion of repos into other repos. > > In a certain situation I would really

Re: [PATCH v2 2/3] prune: fix pruning with multiple worktrees and split index

2017-12-18 Thread Brandon Williams
On 12/17, Thomas Gummerer wrote: > be489d02d2 ("revision.c: --indexed-objects add objects from all > worktrees", 2017-08-23) made sure that pruning takes objects from all > worktrees into account. > > It did that by reading the index of every worktree and adding the > necessary index objects to

Re: Fetching commit instead of ref

2017-12-18 Thread Jonathan Tan
On Mon, 18 Dec 2017 12:30:23 + "Carlsson, Magnus" wrote: > In a certain situation I would really need to fetch all commits > related to a specific commit (SHA). I have read the git fetch > documentation and found nothing regarding this. It only seems to > support

Re: [PATCH v2 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

2017-12-18 Thread Lars Schneider
> On 17 Dec 2017, at 23:51, Thomas Gummerer wrote: > > Split index mode only has a few dedicated tests, but as the index is > involved in nearly every git operation, this doesn't quite cover all the > ways repositories with split index can break. To use split index mode >

Re: [PATCH v1] convert: add support for 'encoding' attribute

2017-12-18 Thread Junio C Hamano
Torsten Bögershausen writes: > Just to confirm my missing knowledge here: > Does this mean, that git-gui and gitk can decode/reencode > the content of a file/blob, when the .gitattributes say so ? These programs, when told that a file is in an encoding, read bytes from that file

Re: [PATCH v2 1/3] repository: fix repo_read_index with submodules

2017-12-18 Thread Brandon Williams
On 12/17, Thomas Gummerer wrote: > repo_read_index calls read_index_from, which takes an path argument for > the location of the index file. For the split index however it relies > on the current working directory to construct the path using git_path. This line isn't actually true and should

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

2017-12-18 Thread Junio C Hamano
Yaroslav Halchenko writes: > On Mon, 18 Dec 2017, Jeff King wrote: > >> To complete that abstraction it seems like reading via "--global" should >> read from both (in the same precedence order that normal config lookup >> uses). > > FWIW +1 from me on that ;) FWIW I do not

commit-msg hook possible bad behavior with -F

2017-12-18 Thread Seth Raymond
If a commit is invoked with -F , indicating that the commit message should be read from an existing file, the the prepare-commit-msg and commit-msg hooks do not operate on . The first argument to the hook is always /COMMIT_EDITMSG, rather than . Am I wrong in this line of thinking? -Seth

RE: [PATCH] p7519: improve check for prerequisite WATCHMAN

2017-12-18 Thread Ben Peart
> -Original Message- > From: René Scharfe [mailto:l@web.de] > Sent: Saturday, December 16, 2017 7:12 AM > To: Git List > Cc: Junio C Hamano ; Ben Peart > ; Ævar Arnfjörð Bjarmason > > Subject: [PATCH]

Usability issue with rebase fork-point option

2017-12-18 Thread Robert Dailey
When upstream is not specified for the rebase command (e.g. I just do `git rebase`), `--fork-point` is assumed which results in commits regenerating SHA1 even if the merge-base would otherwise be identical. Here's my scenario: I set my remote tracking branch to my parent branch: $ git branch -u

Re: [PATCH] revision: introduce prepare_revision_walk_extended()

2017-12-18 Thread Jeff King
On Sat, Dec 16, 2017 at 01:12:16PM +0100, René Scharfe wrote: > prepare_revision_walk() allows callers to take ownership of the array of > pending objects by setting the rev_info flag "leak_pending" and copying > the object_array "pending". They use it to clear commit marks after > setup is

[no subject]

2017-12-18 Thread Bank Director

[no subject]

2017-12-18 Thread Director Bank
Наш офисный контакт, 2554 Дороги Кпэлайм Фэйс Фармаки Бет, Ломе, Залив. Международный валютный фонд (МВФ) дает компенсацию всем жертвам жульничества, и Ваш адрес электронной почты был найден в list.this Денежном грамме жертвы жульничества, и офис Western Union получил мандат МВФ передать Вашу

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

2017-12-18 Thread Yaroslav Halchenko
On Mon, 18 Dec 2017, Jeff King wrote: > To complete that abstraction it seems like reading via "--global" should > read from both (in the same precedence order that normal config lookup > uses). FWIW +1 from me on that ;) -- Yaroslav O. Halchenko Center for Open Neuroscience

Re: [PATCH v1] convert: add support for 'encoding' attribute

2017-12-18 Thread Jeff King
On Mon, Dec 18, 2017 at 11:13:34AM +0100, Torsten Bögershausen wrote: > Just to confirm my missing knowledge here: > Does this mean, that git-gui and gitk can decode/reencode > the content of a file/blob, when the .gitattributes say so ? That's my impression, yes. > If yes, would it make sense

Re: [PATCH v1] convert: add support for 'encoding' attribute

2017-12-18 Thread Jeff King
On Mon, Dec 18, 2017 at 11:54:32AM +0100, Lars Schneider wrote: > > warning: failed to encode 'file' from utf-8 to utf16 > > > > At least it figured out that it couldn't convert the content. It's > > slightly troubling that it would try in the first place, though; are > > there encoding pairs

Fetching commit instead of ref

2017-12-18 Thread Carlsson, Magnus
Hi I am involved in the git-subrepo project (https://github.com/ingydotnet/git-subrepo/). It's an attempt to simplify the inclusion of repos into other repos. In a certain situation I would really need to fetch all commits related to a specific commit (SHA). I have read the git fetch

Re: [PATCH v1] convert: add support for 'encoding' attribute

2017-12-18 Thread Lars Schneider
> On 15 Dec 2017, at 10:58, Jeff King wrote: > > On Mon, Dec 11, 2017 at 04:50:23PM +0100, lars.schnei...@autodesk.com wrote: > >> From: Lars Schneider >> >> Git and its tools (e.g. git diff) expect all text files in UTF-8 >> encoding. Git will

Re: [PATCH v1] convert: add support for 'encoding' attribute

2017-12-18 Thread Torsten Bögershausen
On Mon, Dec 11, 2017 at 09:47:24PM +0100, Johannes Sixt wrote: > Am 11.12.2017 um 16:50 schrieb lars.schnei...@autodesk.com: > >From: Lars Schneider > > > >Git and its tools (e.g. git diff) expect all text files in UTF-8 > >encoding. Git will happily accept content in

Draft of Git Rev News edition 34

2017-12-18 Thread Christian Couder
Hi, A draft of a new Git Rev News edition is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-34.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

Hallo

2017-12-18 Thread Meinze Klaus Peter
Greeting In a brief introduction, I am a lawyer Meinze klaus peter,from Germany but now i lives in London, I sent you an email about your deceased relative, but I have not received any response from you, deceased is a citizen of your country with the same surname with you, he is an exporter