[PATCH v3 0/4] name-rev sanity

2017-03-31 Thread Michael J Gruber
v3 splits the old 3/3 into name-rev and describe related parts and adds documentation. No core dumps encountered so far ;) Did I mention this is on top of mg/describe-debug-l10n (next)? Junio C Hamano (2): name-rev: refactor logic to see if a new candidate is a better name name-rev: favor

[PATCH v3 1/4] name-rev: refactor logic to see if a new candidate is a better name

2017-03-31 Thread Michael J Gruber
From: Junio C Hamano When we encounter a new ref that could describe the commit we are looking at, we compare the name that is formed using that ref and the name we found so far and pick a better one. Factor the comparison logic out to a separate helper function, while

Re: [BUG?] iconv used as textconv, and spurious ^M on added lines on Windows

2017-03-31 Thread Jakub Narębski
W dniu 30.03.2017 o 22:00, Jeff King pisze: > On Thu, Mar 30, 2017 at 09:35:27PM +0200, Jakub Narębski wrote: > >> And everything would be all right... if not the fact that Git appends >> spurious ^M to added lines in the `git diff` output. Files use CRLF >> end-of-line convention (the native MS

RE: Git Branching - Best Practices - Large project - long running branches

2017-03-31 Thread Randall S. Becker
-Original Message- >On March 31, 2017 7:56 AM: Joe Mayne Wrote: >Subject: Git Branching - Best Practices - Large project - long running branches >I work on a team of 15+ developers. We are trying to determine best practices for branching >because we have had code stepped on when a

Re: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

2017-03-31 Thread Jeff Hostetler
On 3/30/2017 4:44 PM, Junio C Hamano wrote: Jeff King writes: Still, I'm not sure the extra layer of cache is all that valuable. It should be a single hash lookup in the config cache (in an operation that otherwise reads the entire index). OK, let's drop that part, then.

Re: [PATCH v3 0/2] read-cache: call verify_hdr() in a background thread

2017-03-31 Thread Jeff Hostetler
On 3/30/2017 4:39 PM, Jeff King wrote: On Thu, Mar 30, 2017 at 09:06:48PM +0100, Thomas Gummerer wrote: Yeah, I think that would be fine. You _could_ write a t/perf test and then use your 400MB monstrosity as GIT_PERF_LARGE_REPO. But given that most people don't have such a thing, there's

Re: Git Branching - Best Practices - Large project - long running branches

2017-03-31 Thread Jakub Narębski
W dniu 31.03.2017 o 13:55, Mayne, Joe pisze: > Hello, I work on a team of 15+ developers. We are trying to > determine best practices for branching because we have had code > stepped on when a developer has a long running feature branch. > > We have a Development branch. Developers are

[PATCH] git-gui: Error on systems with TK < 8.6.0

2017-03-31 Thread Peter van der Does
Using git-gui on systems that run a TK version below 8.6.0 results in a crash when checking for the current theme. Catch the error on those systems and use a different command to check for the current theme. --- git-gui/lib/themed.tcl | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)

Re: [BUG?] iconv used as textconv, and spurious ^M on added lines on Windows

2017-03-31 Thread Torsten Bögershausen
On 30.03.17 21:35, Jakub Narębski wrote: > Hello, > > Recently I had to work on a project which uses legacy 8-bit encoding > (namely cp1250 encoding) instead of utf-8 for text files (LaTeX > documents). My terminal, that is Git Bash from Git for Windows is set > up for utf-8. > > I wanted for

Business Proposal

2017-03-31 Thread Mr Youichi Kanno
Dear Sir/Madam, My name is Youichi Kanno and I work in Audit & credit Supervisory role at The Norinchukin Bank,I am contacting you regarding the asset of a deceased client Mr. Grigor Kassan and I need your assistance to process the fund claims oF $18,100,000.00 (Eighteen Million, One Hundred

Git Branching - Best Practices - Large project - long running branches

2017-03-31 Thread Mayne, Joe
Hello, I work on a team of 15+ developers. We are trying to determine best practices for branching because we have had code stepped on when a developer has a long running feature branch. We have a Development branch. Developers are instructed to create a branch when they begin working on a

Re: ttk error when starting git gui

2017-03-31 Thread Jessie Hernandez
> On Fri, 31 Mar 2017 09:53:38 +0200 > "Jessie Hernandez" wrote: > > [...] >> >> It's possible to have ttk with 8.5 as well (say, here on Debian 8.5 >> >> ships with ttk enabled). >> >> >> >> A proper patch would be >> >> >> >> -set default_config(gui.usettk) 1 >> >>

Business Proposal

2017-03-31 Thread Mr Youichi Kanno
Dear Sir/Madam, My name is Youichi Kanno and I work in Audit & credit Supervisory role at The Norinchukin Bank,I am contacting you regarding the asset of a deceased client Mr. Grigor Kassan and I need your assistance to process the fund claims oF $18,100,000.00 (Eighteen Million, One Hundred

Get Back To Me Fast

2017-03-31 Thread Mr James Musa
Good day my good friend, Let me start by introducing myself. I am James Musa, an accounts officer with Bank of Africa here in Burkina Faso West Africa. I am writing you this letter based on the latest development at my bank whichI will like to bring to your personal edification. ($9million)

Re: ttk error when starting git gui

2017-03-31 Thread Konstantin Khomoutov
On Fri, 31 Mar 2017 09:53:38 +0200 "Jessie Hernandez" wrote: [...] > >> It's possible to have ttk with 8.5 as well (say, here on Debian 8.5 > >> ships with ttk enabled). > >> > >> A proper patch would be > >> > >> -set default_config(gui.usettk) 1 > >> +set

Re: ttk error when starting git gui

2017-03-31 Thread Konstantin Khomoutov
On Fri, 31 Mar 2017 09:45:03 +0200 "Jessie Hernandez" wrote: > >> I also got this problem when I wanted to build and run git 2.10.x. > >> I have added the following change to git-gui/git-gui.sh > >> > >> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh > >> index

Re: ttk error when starting git gui

2017-03-31 Thread Jessie Hernandez
>> On Fri, 31 Mar 2017 08:44:27 +0200 >> "Jessie Hernandez" wrote: >> >> [...] >>> I also got this problem when I wanted to build and run git 2.10.x. >>> I have added the following change to git-gui/git-gui.sh >>> >>> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh

Re: ttk error when starting git gui

2017-03-31 Thread Jessie Hernandez
> On Fri, 31 Mar 2017 08:44:27 +0200 > "Jessie Hernandez" wrote: > > [...] >> I also got this problem when I wanted to build and run git 2.10.x. >> I have added the following change to git-gui/git-gui.sh >> >> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh >> index

Terrible bad performance for it blame --date=iso -C -C master --

2017-03-31 Thread Ulrich Windl
Hi! I was running "vc-annotate" in Emacs for a file from a large repository (>4 files, a big percentage being binary, about 10 commits). For the first file the result was presented rather soon, but for a second file the command did not finish even after about 10 minutes! The file in

Re: ttk error when starting git gui

2017-03-31 Thread Konstantin Khomoutov
On Fri, 31 Mar 2017 08:44:27 +0200 "Jessie Hernandez" wrote: [...] > I also got this problem when I wanted to build and run git 2.10.x. > I have added the following change to git-gui/git-gui.sh > > diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh > index

Re: ttk error when starting git gui

2017-03-31 Thread Jessie Hernandez
> Hello, > > I get the following error when trying to start git gui: > > Error in startup script: wrong # args: should be "ttk::style theme use > theme" > while executing > "ttk::style theme use" > (procedure "ttext" line 4) > invoked from within > "ttext $ui_workdir -background

<    1   2