Re: [PATCH v5 2/4] format-patch: add '--base' option to record base tree info

2016-04-23 Thread Ye Xiaolong
On Fri, Apr 22, 2016 at 02:59:42PM -0700, Junio C Hamano wrote: >Xiaolong Ye writes: > >> +test_expect_success 'format-patch --base' ' >> +git checkout side && >> +git format-patch --stdout --base=HEAD~~~ -1 >patch && >> +grep -e "^base-commit:" -A3 patch

Re: [PATCH v5 3/4] format-patch: introduce --base=auto option

2016-04-23 Thread Ye Xiaolong
On Fri, Apr 22, 2016 at 02:54:16PM -0700, Junio C Hamano wrote: >Xiaolong Ye writes: > >> +if (upstream) { >> +unsigned char sha1[20]; >> +if (get_sha1(upstream, sha1)) >> +die(_("Failed to

[PATCH v2] fast-import: implement unpack limit

2016-04-23 Thread Eric Wong
Jeff King wrote: > There we have fetch.unpackLimit and receive.unpackLimit for the two > operations, plus transfer.unpackLimit to control both of them. This > doesn't necessarily need to be tied to that config, but you could > certainly consider it in the same boat. It's a way of

Re: [PATCH v6 01/10] t0027: Make more reliable

2016-04-23 Thread Torsten Bögershausen
On 2016-04-23 00.03, Junio C Hamano wrote: > tbo...@web.de writes: > >> From: Torsten Bögershausen >> Subject: Re: [PATCH v6 01/10] t0027: Make more reliable > > "Make more reliable" does not sound very grammatical. > >> Make the commit_chk_wrnNNO test in t0027 more reliable: >

Re: [PATCH v5 2/4] format-patch: add '--base' option to record base tree info

2016-04-23 Thread Ye Xiaolong
On Fri, Apr 22, 2016 at 02:39:28PM -0700, Junio C Hamano wrote: >Xiaolong Ye writes: > >> diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh >> index eed2981..a6ce727 100755 >> --- a/t/t4014-format-patch.sh >> +++ b/t/t4014-format-patch.sh >> @@ -1460,4 +1460,19

GSoC Project Selected | Incremental Rewrite of git bisect

2016-04-23 Thread Pranit Bauva
Hey everyone, I am Pranit Bauva studying Mining Engineering at Indian Institute of Technology, Kharagpur. I have applied for Google Summer of Code 2016 under Git organization and my project[1], "Incremental Rewrite of git bisect has been selected under the guidance of mentors namely Christian

Allow worktree in same path with different gitdir

2016-04-23 Thread Carlos Pita
Hi all, I usually keep my dotfiles, scripts, etc. in a git repo at ~, both as a backup solution and as a way to sync config between my different computers and remote servers in which I have to work. Some of these computers require a small number of local configurations that I like to keep in a

铜铅精矿

2016-04-23 Thread 铜铅精矿
你的老朋友邀你来Q群:343257759 抢红包 抢秒杀 抢vip 什么都要抢。太刺激了。不靠手气只拼手速

Re: What's cooking in git.git (Apr 2016, #06; Thu, 21)

2016-04-23 Thread Pranit Bauva
On Sat, Apr 23, 2016 at 3:42 AM, Junio C Hamano wrote: > Junio C Hamano writes: > Is this going to be rerolled? ($gmane/291382) >>> >>> The changes weren't that big enough and I had my end semester exams >>> coming so I decided not to re-roll it.

Awkward and confusing question in git --send-email

2016-04-23 Thread John Darrington
Git --send-email poses the question: "Who should the emails be sent to (if any)?" Apart from sounding clumsy (not to mention incorrect grammar), it took me a while to work out what this meant. I suggest this be changed to : "To whom should the email be sent (if anyone) ?" J' -- Avoid

[PATCH 2/2] git-p4 tests: work with python3 as well as python2

2016-04-23 Thread Luke Diamand
Update the git-p4 tests so that they work with both Python2 and Python3. We have to be explicit about the difference between Unicode text strings (Python3 default) and raw binary strings which will be exchanged with Perforce. Additionally, print always takes braces in Python3. Signed-off-by:

[PATCH 1/2] git-p4 tests: cd to testdir before running python

2016-04-23 Thread Luke Diamand
The python one-liner for getting the current time prints out error messages if the current directory is deleted while it is running if using python3. Avoid these messages by switching back to the test directory before running python3, instead of remaining in the trash directory. Signed-off-by:

[PATCH 0/2] git-p4: support python3 in the tests

2016-04-23 Thread Luke Diamand
This patchset updates the git-p4 tests so that they work with either Python2 or Python3. Note that this does *not* fix git-p4 to work with Python3 - that's a much bigger challenge. Luke Diamand (2): git-p4 tests: cd to testdir before running python git-p4 tests: work with python3 as well as