Re: git-p4 clone @all error

2012-11-06 Thread Arthur
Thanks for your support, If i get latest révision on Perforce i have this errors : /590 errors reported Librarian checkout depot/mainline/02_subsystem/10_arinc_429/00_cots/01_bsp_aim/original files/api429decryption.txt failed. open for read:

Bug: write-tree corrupts intent-to-add index state

2012-11-06 Thread Jonathon Mah
Hi revisionaries, I came across what appears to be a bug while working today. I had several changes, both staged and unstaged, and two files that I had marked with intent-to-add (git add -N). $ git status -sb ## Library-3.x...origin/Library-3.x [ahead 4] M Library/LIRootSource.m M

Deprecated help message

2012-11-06 Thread Jeroen van der Ham
Hi, It seems I hit a deprecated help message: % git pull There is no tracking information for the current branch. Please specify which branch you want to merge with. See git-pull(1) for details git pull remote branch If you wish to set tracking information for this branch you can do so

[PATCH] push/pull: adjust missing upstream help text to changed interface

2012-11-06 Thread Michael J Gruber
In case of a missing upstream, the git-parse-remote script suggests: If you wish to set tracking information for this branch you can do so with: git branch --set-upstream nsiv2 origin/branch But --set-upstream is deprectated. Change the suggestion to: git branch

Re: Bug: write-tree corrupts intent-to-add index state

2012-11-06 Thread Nguyen Thai Ngoc Duy
On Tue, Nov 06, 2012 at 12:53:27AM -0800, Jonathon Mah wrote: It appears the index forgot that those files were new. So not only has the intent-to-add status been lost, but git status shows a file existing in neither HEAD nor the index as not-new-but-modified. Tracing through it, I narrowed

Re: [PATCH 14/13] wildmatch: fix tests that fail on Windows due to path mangling

2012-11-06 Thread Nguyen Thai Ngoc Duy
On Mon, Nov 5, 2012 at 4:00 AM, Johannes Sixt j...@kdbg.org wrote: Patterns beginning with a slash are converted to Windows paths before test-wildmatch gets to see them. Use a different first character. Or we could prepend the paths with something, which is then cut out by test-wildmatch. Not

Re: git-p4 clone @all error

2012-11-06 Thread Vitor Antunes
Arthur a.foulon at amesys.fr writes: Thanks for your support, If i get latest révision on Perforce i have this errors : /590 errors reported Librarian checkout depot/mainline/02_subsystem/10_arinc_429/00_cots/01_bsp_aim/original files/api429decryption.txt failed. open for

Re: git-p4 clone @all error

2012-11-06 Thread Arthur
root@Srv-git:/home/arthur/projets_git# git config git-p4.branchList main:MAINLINE error: More than one value for the key git-p4.branchlist: MAINLINE:DEV_DATA error: More than one value for the key git-p4.branchlist: MAINLINE:RELEASE_1.0 error: More than one value for the key git-p4.branchlist:

Re: git-p4 clone @all error

2012-11-06 Thread Arthur
In ~/.gitconfig i've : [user] name = Arthur email = a.xx...@x.fr [git-p4] branchList = MAINLINE:DEV_DATA branchList = MAINLINE:RELEASE_1.0 branchList = MAINLINE:RELEASE_1.0.0 it's ok ? So : /# git config git-p4.branchList MAINLINE:DEV_DATA error:

Re: [PATCH 0/5] Use string_lists when processing notes

2012-11-06 Thread Johan Herland
On Tue, Nov 6, 2012 at 8:56 AM, Michael Haggerty mhag...@alum.mit.edu wrote: On 11/04/2012 10:05 PM, Johan Herland wrote: On Sun, Nov 4, 2012 at 8:07 AM, Michael Haggerty mhag...@alum.mit.edu wrote: This simplifies the code. Also, sort lines all at once (O(N lg N)) rather than insertion

Re: [PATCH] push/pull: adjust missing upstream help text to changed interface

2012-11-06 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net wrote: Yes, I'm in low hanging fruits mood. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net It is called tying loose ends, and is very important. Very much appreciated. -- To unsubscribe from this list: send the line unsubscribe git in the

Re: git-p4 clone @all error

2012-11-06 Thread Vitor Antunes
Arthur a.foulon at amesys.fr writes: In ~/.gitconfig i've : [user] name = Arthur email = a.x at x.fr [git-p4] branchList = MAINLINE:DEV_DATA branchList = MAINLINE:RELEASE_1.0 branchList = MAINLINE:RELEASE_1.0.0 it's ok ? So : /#

Re: Workflow for templates?

2012-11-06 Thread Josef Wolf
No suggestions on this one? On Wed, Oct 31, 2012 at 11:44:04AM +0100, Josef Wolf wrote: I am somewhat unsure whether it would work this way. After all, there seems to be an unbreakable rule with git: never rebase published branches. Thus, once I have published my work to other people who

Rebasing published branches?

2012-11-06 Thread Josef Wolf
Hello, I know, I should never rebase published branches. But... I frequently work on different computers and would like to share my private branches across them. When done and the feature is in a good shape, I'd like to rebase to clean up history before I make it available to other people. I

RE: Workflow for templates?

2012-11-06 Thread Pyeron, Jason J CTR (US)
Maybe I lost sight of your problem. Can you give a specific example of where it does not work? -Original Message- From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On Behalf Of Josef Wolf Sent: Tuesday, November 06, 2012 2:51 PM To: git@vger.kernel.org Subject: Re: