Re: why '--init' in git-submodule update

Hi, On Mon, Nov 5, 2012 at 10:30 PM, Heiko Voigt wrote: > Hi, > > On Mon, Nov 05, 2012 at 05:30:51PM +0100, Francis Moreau wrote: >> I'm wondering why the --init option from git-submodule-update is not >> at least the defaut. Or even wilder, why this option exists at all and >> git-submodule-upda

Re: Support for a series of patches, i.e. patchset or changeset?

On Tue, Nov 6, 2012 at 3:44 PM, Johannes Sixt wrote: > Am 11/6/2012 7:56, schrieb Eric Miao: >> On Tue, Nov 6, 2012 at 2:39 PM, Johannes Sixt wrote: >>> Am 11/6/2012 1:58, schrieb Eric Miao: E.g. when we merged a series of patches: [PATCH 00/08] [PATCH 01/08] ... >>

Re: Rebasing published branches?

On 06/11/2012 8:18 pm, Josef Wolf wrote: Hello, I know, I should never rebase published branches. But... The major trouble with making rewritten branches public is one of merges. Assume I have two local repos, A and B, sharing a single remote. I create a branch in A, push it to the remote,

Re: What about SHA-1 collisions?

On Tue, Nov 06, 2012 at 09:41:29PM +, John McKown wrote: > Josef Wolf raven.inka.de> writes: > > Just for curiosity: what would happen if such a collision would occur within > > one repository? > In a sense, this cannot happen. In the scenario you described, contents of this version of file

Re: What about SHA-1 collisions?

Josef Wolf raven.inka.de> writes: > > Hello, > > we all know, the probability for SHA-1 collisions is very, very low, almost > non-existant. But we also know that they are not impossible. > > Just for curiosity: what would happen if such a collision would occur within > one repository? > In

git ls-files --ignored and ignored directory

I would like to use git ls-files to show all the ignored files, including directory. As an example of setup: mkdir /tmp/git && cd /tmp/git git init mkdir a b touch a/a touch b/b cat >.gitignore << EOF a/ b/* EOF Then if I do: $ git ls-files --exclude-standard --ignored --others b/b $ git ls-file

Re: Workflow for templates?

On Tue, Nov 06, 2012 at 08:21:25PM +, Pyeron, Jason J CTR (US) wrote: > Maybe I lost sight of your problem. Can you give a specific example of where > "it" does not work? I guess it's _me_ who's lost. I can't figure how this is supposed to work. Maybe you have an example? -- To unsubscribe fr

[git-svn] [bug report] Index in strange state after git svn rebase

Hi Everybody, Please Cc: me, I am not subscribed I'm encountering an issue with "git svn rebase". Included in this email is a summary of the issue, and it is fully detailed in this stackoverflow question: http://stackoverflow.com/questions/13183534/why-does-git-rebase-leave-opposite-sets-of-modif

What about SHA-1 collisions?

Hello, we all know, the probability for SHA-1 collisions is very, very low, almost non-existant. But we also know that they are not impossible. Just for curiosity: what would happen if such a collision would occur within one repository? -- To unsubscribe from this list: send the line "unsubscribe

RE: Workflow for templates?

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 > Subje

Rebasing published branches?

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 gue

Re: Workflow for templates?

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

Re: git-p4 clone @all error

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

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

Michael J Gruber wrote: >Yes, I'm in low hanging fruits mood. > >Signed-off-by: Michael J Gruber 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 body of a message to majord...@vger.kernel.org

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

On Tue, Nov 6, 2012 at 8:56 AM, Michael Haggerty wrote: > On 11/04/2012 10:05 PM, Johan Herland wrote: >> On Sun, Nov 4, 2012 at 8:07 AM, Michael Haggerty >> wrote: >>> This simplifies the code. Also, sort lines all at once (O(N lg N)) >>> rather than insertion sorting as lines are processed (O

Re: git-p4 clone @all error

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: Mo

Re: git-p4 clone @all error

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: MA

Re: git-p4 clone @all error

Arthur 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: [PATCH 14/13] wildmatch: fix tests that fail on Windows due to path mangling

On Mon, Nov 5, 2012 at 4:00 AM, Johannes Sixt 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 sure if it's

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

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 narro

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

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/ But --set-upstream is deprectated. Change the suggestion to: git branch --set-upstream-to=origin/ nsiv

Deprecated help message

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 If you wish to set tracking information for this branch you can do so with: git b

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

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 Library/Lib

Re: git-p4 clone @all error

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: depot/mainline/02_subsystem/10_arinc_429/0