git question

git question

[Mark Hounschell]

It's been a while but this used to work.

# git clone 
git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-allstable.git
Cloning into linux-2.6-allstable...
fatal: The remote end hung up unexpectedly

Google showed nothing helpful? Where do I go. I need to bisect from 
2.6.38 to 2.6.39

Thanks
Mark

Re: git question

[Jack Stone]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 02/02/12 19:41, Mark Hounschell wrote:
> It's been a while but this used to work.
> 
> # git clone 
> git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-allstable.git
>
> 
Cloning into linux-2.6-allstable...
> fatal: The remote end hung up unexpectedly
> 
> Google showed nothing helpful? Where do I go. I need to bisect
> from 2.6.38 to 2.6.39
> 

That repo has been deleted. The full list is available at:

git.kernel.org

If you want to bisect 2.6.38 -> 2.6.39 then I sugest you try :

git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Which is Linus' official repo. If you want to bisect from 2.6.38.x ->
something else then you will have to try the stable repo, I think the
following will help:

git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git

The only thing to be careful of is that 2.6.39.x is not a direct
decendant of 2.6.38.x, but it is a direct decentant of 2.6.38: the
stable trees have patches added in parallel.

Hope this helps,

Jack
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iJwEAQECAAYFAk8q6M4ACgkQNmg8QyarTdKLdQP/dyQ8TJVNTPwU5mcQiDP+GtIs
lhDlBCDqMRLgpIRz3Wrju/nJQQILv2lUbIGrCpXNT59F12UOTLbMDE6MDNXt8x+j
Vk8BKZhKcu4sNWXWvSVkqMLWBVhk1wPQkgw0mveaiGvf5DLV7WQunD9hwmSF05lf
gvJGkTTHew13IUv8j5E=
=B7MR
-----END PGP SIGNATURE-----

Re: git question

[Mark Hounschell]

On 02/02/2012 02:49 PM, Jack Stone wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 02/02/12 19:41, Mark Hounschell wrote:
>> It's been a while but this used to work.
>>
>> # git clone
>> git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-allstable.git
>>
>>
> Cloning into linux-2.6-allstable...
>> fatal: The remote end hung up unexpectedly
>>
>> Google showed nothing helpful? Where do I go. I need to bisect
>> from 2.6.38 to 2.6.39
>>
>
> That repo has been deleted. The full list is available at:
>
> git.kernel.org
>
> If you want to bisect 2.6.38 ->  2.6.39 then I sugest you try :
>
> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
>
> Which is Linus' official repo. If you want to bisect from 2.6.38.x ->
> something else then you will have to try the stable repo, I think the
> following will help:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
>
> The only thing to be careful of is that 2.6.39.x is not a direct
> decendant of 2.6.38.x, but it is a direct decentant of 2.6.38: the
> stable trees have patches added in parallel.
>
> Hope this helps,

Yes it does. Thank you very much.

Mark

Git Question

[Mark Wartman]

Hello,

I am currently running git version 2.10.1 (Apple Git-78).  When I run git config —list:   it returns
credential.helper-osxkeychain
filter.lfs.clean=git=lfs clean — %f
filter.lfs.smudge=git-lfs smudge — %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
user.name=markwartman1
user.email=markwartman@d2l.lonestar.edu

I am following this tutorial and I expected to only see user.name & user.email, so what are the filters.lfs’s and the credential.helper?  Should I ignore them, or try to get rid of them?  Please advise.  

What is the best way to upgrade to a newer stable version of git?

Thanks,

Mark

Re: Git Question

[Taylor Blau]

On Wed, Mar 28, 2018 at 08:49:19PM -0500, Mark Wartman wrote:
> I am following this tutorial and I expected to only see user.name &
> user.email, so what are the filters.lfs’s and the credential.helper?
> Should I ignore them, or try to get rid of them?  Please advise.

The `filter.lfs` configuration is set by Git LFS [1] in order to
correctly filter large files into your working copy.

You can safely ignore these, or remove them if you are not using Git
LFS.

> What is the best way to upgrade to a newer stable version of git?

On macOS, you can use Homebrew [2] to install any version of Git.
Install the latest via:

  brew update && brew install git

Thanks,
Taylor

[1]: https://git-lfs.github.com
[2]: https://brew.sh

Re: Git Question

[Taylor Blau]

On Sat, Mar 31, 2018 at 09:06:53PM -0500, Mark Wartman wrote:
> I saw this pretty exhaustive .gitignore list that a GitHub Help page
> linked to: 9257657 <https://gist.github.com/octocat/9257657> .  Are
> these configurations from the list something one should install on the
> User/global level, or do you recommend managing it in each and every
> project repository?

If those appear helpful for your project(s), then sure; but this is up
to you.

> Concerning these items below, when I said I get these when running a:
> git config —list
>
> credential.helper-osxkeychain
> filter.lfs.clean=git=lfs clean — %f
> filter.lfs.smudge=git-lfs smudge — %f
> filter.lfs.process=git-lfs filter-process
> filter.lfs.required=true
>
> I suspect that the GitHub GUI tool has installed them.  Do you find
> that possible?  I ask because I did not write them.

Yes, I believe that GitHub Desktop runs 'git lfs install', which adds
these to your configuration.


Thanks,
Taylor

GIT Question

[Draggs, Tori]

Specs:
MacBook Pro 
OS X Yosemite
2.6 GHz Intel Core i5, 8GN 1600 MHz DDR3

After selecting the Git option in a recent install of Visual Studio Code 2015 for MAC, my filesystem was removed. I can no longer access any of the local files stored on my machine. After researching many blogs/websites to no avail I am reaching out to you.  I contacted Apple Support who instructed me to contact the developers for GIT.
 
I am a struggling college student interested in a development career. After spending nearly a year to save up for my laptop - seeing everything gone after a few lines of code is more than devastating.  I am new to GIT and am overwhelmed by the breadth of information available.  If you could share your expertise and guide me to a resource that may address this issue I would be so very grateful.  This is my first real project and I was trying to get myself set up with Visual Studio Code 2015 for Mac.  I know that is not your concern, so getting back to my inquiry - specifically I am looking for information on rolling back a possible commit that removed my entire MacBook Pro file system. I have the .bash_history and am including it below. 

git
git status
git log
git rm
git rm -r
--r
git -r
--r git
git
git diff
git log
git status
git log -diff-filter=D -summary
git log -diff-filter=D -summary
git log -diff-filter=D -author=Parent -summary
gitcheckout <commit>~1 (I believe this is where things exploded)
git fsck -lost-found
ls  .git/lost-found/other
ls.git/lost-found/other
git fsck -lost-found ls .git/lost-found/other
git stash
git pull -rebase
git stash pop
git reflog
git checkout -b branch-name c3a4103
git fsck -lost-found ls unreachable
open .git/lost-found/other
cd .git/lost-found/othergit cat-file -p c3a4103
git rm -rf
git reset -hard
git resert -hard
--help
Help
Restore
--restore

--While there is more I don't believe it will assist with your investigation.  If the full file is needed, I would be more than happy to forward it to your attention.   




Thank you again for your time and expertise.  

Tori Draggs
Tori.draggs@mercy.net
Techgeek2013@gmail.com
Github: https://github.com/gnugal314 

This electronic mail and any attached documents are intended solely for the named addressee(s) and contain confidential information. If you are not an addressee, or responsible for delivering this email to an addressee, you have received this email in error and are notified that reading, copying, or disclosing this email is prohibited. If you received this email in error, immediately reply to the sender and delete the message completely from your computer system.

Re: GIT Question

[Johannes Schindelin]

Hi Tori,

On Wed, 20 Jan 2016, Draggs, Tori wrote:

> Specs:
> MacBook Pro 
> OS X Yosemite
> 2.6 GHz Intel Core i5, 8GN 1600 MHz DDR3
> 
> After selecting the Git option in a recent install of Visual Studio Code
> 2015 for MAC, my filesystem was removed.

Can you call Visual Studio Code? If so, the filesystem was definitely not
removed, so that's good news.

> I can no longer access any of the local files stored on my machine.

The most likely cause is that you are now looking somewhere else than
where the files are actually. Could you use the magnifying glass on the
upper right hand corner to search for a file name of the files you had
previously?

Ciao,
Johannes

RE: GIT Question

[Johannes Schindelin]

Hi Tori,

please reply-to-all. I really have no time to serve as your personal,
free-of-cost help desk. But I am willing to help on the mailing list.

On Fri, 22 Jan 2016, Draggs, Tori wrote:

> Hi.  I am able to pull up Visual Studio Code.  But none of my local
> files.  I tried using the magnifying glass as well as the Go To feature
> and when performing a search I am informed that the file is not found. 

Were your files inside the .app, or did you store them in your Documents/
folder?

Ciao,
Johannes

RE: GIT Question

[Draggs, Tori]

I apologize, however my intent in reaching out was not to seek free of cost help desk services.  After speaking with Apple they suggested that I contact both Git and Code developers for feedback on the commands I used prior to the potential file removal.  

I appreciate your assistance thus far and will reach out to the mailing list as you've described below.  Again thank you for your time and have a good day. 

-----Original Message-----
From: Johannes Schindelin [mailto:Johannes.Schindelin@gmx.de] 
Sent: Friday, January 22, 2016 11:09 AM
To: Draggs, Tori
Cc: git@vger.kernel.org
Subject: RE: GIT Question

Hi Tori,

please reply-to-all. I really have no time to serve as your personal,
free-of-cost help desk. But I am willing to help on the mailing list.

On Fri, 22 Jan 2016, Draggs, Tori wrote:

> Hi.  I am able to pull up Visual Studio Code.  But none of my local
> files.  I tried using the magnifying glass as well as the Go To feature
> and when performing a search I am informed that the file is not found. 

Were your files inside the .app, or did you store them in your Documents/
folder?

Ciao,
Johannes
This electronic mail and any attached documents are intended solely for the named addressee(s) and contain confidential information. If you are not an addressee, or responsible for delivering this email to an addressee, you have received this email in error and are notified that reading, copying, or disclosing this email is prohibited. If you received this email in error, immediately reply to the sender and delete the message completely from your computer system.

Re: GIT Question

[Santiago Torres]

On Fri, Jan 22, 2016 at 05:22:16PM +0000, Draggs, Tori wrote:
> I apologize, however my intent in reaching out was not to seek free of cost help desk services.

Don't worry, just use reply to all so everyone can see and chime in if
they can help.

> > Hi.  I am able to pull up Visual Studio Code.  But none of my local
> > files.  I tried using the magnifying glass as well as the Go To feature
> > and when performing a search I am informed that the file is not found. 

I see you were able to run git log, what do you see in it? as it might
shed some light on what happened.

-Santiago.

git question

[chromaticwt zac]

I have a git question regarding the linux kernel. I have cloned
linux-stable. I want to merge fs/btrfs from another tree into my
linux-stable repo. how can I do this?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20120123/fbcb05fa/attachment.html 

git question

[Tirtha Ghosh]

if you want to merge the whole branch..use git merge (
http://book.git-scm.com/3_basic_branching_and_merging.html ). You might get
some conflicts..resolve them, add them and continue with git merge.

On other hands, if you want to get only some of the commits and not the
whole branch...you can use git cherry-pick (
http://wiki.koha-community.org/wiki/Using_Git_Cherry_Pick ). You still
might get some conflicts..resolve and add them and use "git commit -c
<commit id>"

Links provided are good to follow.

regards,
Tirtha

On Tue, Jan 24, 2012 at 4:32 AM, chromaticwt zac <zac.3.14159@gmail.com>wrote:

> I have a git question regarding the linux kernel. I have cloned
> linux-stable. I want to merge fs/btrfs from another tree into my
> linux-stable repo. how can I do this?
>
> _______________________________________________
> Kernelnewbies mailing list
> Kernelnewbies at kernelnewbies.org
> http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20120124/a3a9e2c4/attachment.html 

[can-utils] canbusload: flush output at the end of each cycle

[Kurt Van Dijck]

canbusload: flush output at the end of each cycle

When canbusload is piped to another program, the output
is queued for several cycles. This patch will flush the output
explicitely.

Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>

This patch is available in git@gitorious.org:~kurt-vd/can-j1939-utils
in branch regular.

diff --git a/canbusload.c b/canbusload.c
index 26323d2..2693b9e 100644
--- a/canbusload.c
+++ b/canbusload.c
@@ -201,6 +201,7 @@ void printstats(int signo)
 	}
 
 	printf("\n");
+	fflush(stdout);
 
 	alarm(1);
 }

Re: [can-utils] canbusload: flush output at the end of each cycle

[Oliver Hartkopp]

On 21.12.2011 10:19, Kurt Van Dijck wrote:

> canbusload: flush output at the end of each cycle
> 
> When canbusload is piped to another program, the output
> is queued for several cycles. This patch will flush the output
> explicitely.
> 
> Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>


Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>

Tnx Kurt.

I'll put it into the can-utils tree the next days.

Regards,
Oliver

> 
> This patch is available in git@gitorious.org:~kurt-vd/can-j1939-utils
> in branch regular.
> 
> diff --git a/canbusload.c b/canbusload.c
> index 26323d2..2693b9e 100644
> --- a/canbusload.c
> +++ b/canbusload.c
> @@ -201,6 +201,7 @@ void printstats(int signo)
>  	}
>  
>  	printf("\n");
> +	fflush(stdout);
>  
>  	alarm(1);
>  }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-can" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [can-utils] canbusload: flush output at the end of each cycle

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 884 bytes --]

On 12/22/2011 07:40 AM, Oliver Hartkopp wrote:
> On 21.12.2011 10:19, Kurt Van Dijck wrote:
> 
>> canbusload: flush output at the end of each cycle
>>
>> When canbusload is piped to another program, the output
>> is queued for several cycles. This patch will flush the output
>> explicitely.
>>
>> Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>
> 
> 
> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
> 
> Tnx Kurt.
> 
> I'll put it into the can-utils tree the next days.

nitpick:
Oliver, please don't forget to add your S-o-b if you are pushing commits
to the tree.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

git question

[Kurt Van Dijck]

> nitpick:
> Oliver, please don't forget to add your S-o-b if you are pushing commits
> to the tree.
in that regard, I was wondering if one could add the S-o-b way after
the actual commit? 

Kurt

Re: git question

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 732 bytes --]

On 01/11/2012 12:18 PM, Kurt Van Dijck wrote:
>> nitpick:
>> Oliver, please don't forget to add your S-o-b if you are pushing commits
>> to the tree.
> in that regard, I was wondering if one could add the S-o-b way after
> the actual commit? 

Yes but no.

Yes, you can change the commit message (git commit --amend), but if you
have already pushed it to the central repo on gitorious, you should not
do it, as it changes the history.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

Re: git question

[Kurt Van Dijck]

On Wed, Jan 11, 2012 at 12:28:21PM +0100, Marc Kleine-Budde wrote:
> On 01/11/2012 12:18 PM, Kurt Van Dijck wrote:
> >> nitpick:
> >> Oliver, please don't forget to add your S-o-b if you are pushing commits
> >> to the tree.
> > in that regard, I was wondering if one could add the S-o-b way after
> > the actual commit? 
> 
> Yes but no.
> 
> Yes, you can change the commit message (git commit --amend), but if you
> have already pushed it to the central repo on gitorious, you should not
> do it, as it changes the history.

thanks for the answer.
Kurt

git question

[Stefan Kuhne]

[-- Attachment #1.1: Type: text/plain, Size: 319 bytes --]

Hello,

how can i get pv/pcifront-2.6.32 from Konrad.
When i make "git clone
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git
xen-pcifront/" i get a complete 2.6.34 Kernel Tree.

And:
root@Dev-Eis2:/usr/src/xen-pcifront# git tag -l
root@Dev-Eis2:/usr/src/xen-pcifront#

Regards,
Stefan Kuhne


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 552 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: git question

[Vincent Hanquez]

On 14/08/10 10:25, Stefan Kuhne wrote:
> Hello,
>
> how can i get pv/pcifront-2.6.32 from Konrad.
> When i make "git clone
> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git
> xen-pcifront/" i get a complete 2.6.34 Kernel Tree.

   git branch -a

After you have identified the remote branch you want to clone (origin is 
the remote that you're originally cloning from)

   git checkout --track origin/X

In your case i suppose you want:

   git checkout --track origin/pv/pcifront-2.6.32

Then you can verify everything is alright doing a :

   git branch

It should list a master branch and a pv/pcifront-2.6.32 branch that 
should be your current branch (the presence of the * indicate your 
current branch)

-- 
Vincent

Re: git question

[Stefan Kuhne]

[-- Attachment #1.1: Type: text/plain, Size: 496 bytes --]

Am 14.08.2010 13:11, schrieb Vincent Hanquez:
> On 14/08/10 10:25, Stefan Kuhne wrote:

Hello,

>> how can i get pv/pcifront-2.6.32 from Konrad.
>> When i make "git clone
>> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git
>> xen-pcifront/" i get a complete 2.6.34 Kernel Tree.
> 
>   git branch -a
> 
could it be, that it is always a complete Kernel tree?
I understand the summit papers so that there where plain patches for
vanilla trees.

Regards,
Stefan Kuhne


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 552 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: git question

[Pasi Kärkkäinen]

On Sat, Aug 14, 2010 at 03:15:11PM +0200, Stefan Kuhne wrote:
> Am 14.08.2010 13:11, schrieb Vincent Hanquez:
> > On 14/08/10 10:25, Stefan Kuhne wrote:
> 
> Hello,
> 
> >> how can i get pv/pcifront-2.6.32 from Konrad.
> >> When i make "git clone
> >> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git
> >> xen-pcifront/" i get a complete 2.6.34 Kernel Tree.
> > 
> >   git branch -a
> > 
> could it be, that it is always a complete Kernel tree?
> I understand the summit papers so that there where plain patches for
> vanilla trees.
> 

Yes, it's a full kernel tree including the patches.
Different branches have different patches. 

You can use git to merge the patches from branch A to branch B.

-- Pasi

Re: git question

[Stefan Kuhne]

[-- Attachment #1.1: Type: text/plain, Size: 346 bytes --]

Am 14.08.2010 16:16, schrieb Pasi Kärkkäinen:

Hello Pasi,

> You can use git to merge the patches from branch A to branch B.
> 
but i need the plain patches for a vanilla tree and other patches.
So this patches should come into an patchset.

Do i have to make a diff beetwen Konrads tree and a vanilla one?

Regards,
Stefan Kuhne


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 552 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: git question

[Daniel Stodden]

On Sat, 2010-08-14 at 10:22 -0400, Stefan Kuhne wrote:
> Am 14.08.2010 16:16, schrieb Pasi Kärkkäinen:
> 
> Hello Pasi,
> 
> > You can use git to merge the patches from branch A to branch B.
> > 
> but i need the plain patches for a vanilla tree and other patches.
> So this patches should come into an patchset.
>
> Do i have to make a diff beetwen Konrads tree and a vanilla one?

Navigate to the branch you're interested in, using git checkout as
described above.

You can use git log to view commits to that particular branch you're
on. 

With -p to see the patches inline, if that helps.

Patches are listed in reverse order, use -<n> to seen the last n
commits. I usually also use --oneline a lot.

Use git format-patch to export patches. 

Briefly check out rev-parse for an overview on how to select particular
revisions and ranges. Before you get more familiar with that, just using
-<n> is probably more straightforward.

Cheers,
Daniel

Re: git question

[Josip Rodin]

On Sat, Aug 14, 2010 at 04:22:03PM +0200, Stefan Kuhne wrote:
> > You can use git to merge the patches from branch A to branch B.
> 
> but i need the plain patches for a vanilla tree and other patches.
> So this patches should come into an patchset.
> 
> Do i have to make a diff beetwen Konrads tree and a vanilla one?

git diff the last tag from the vanilla branch and his last tag, or his HEAD.

You can also git fetch a vanilla tree into the same checkout, and then
git diff the two branches.

-- 
     2. That which causes joy or happiness.

Re: git question

[Konrad Rzeszutek Wilk]

On Mon, Aug 16, 2010 at 01:55:27PM +0200, Josip Rodin wrote:
> On Sat, Aug 14, 2010 at 04:22:03PM +0200, Stefan Kuhne wrote:
> > > You can use git to merge the patches from branch A to branch B.
> > 
> > but i need the plain patches for a vanilla tree and other patches.
> > So this patches should come into an patchset.
> > 
> > Do i have to make a diff beetwen Konrads tree and a vanilla one?
> 
> git diff the last tag from the vanilla branch and his last tag, or his HEAD.

Like this: git diff v2.6.32..origin/pv/pcifront-2.6.32

Thought the latest patches that I've been posting for review are in:
devel/xen-pcifront-0.5 and they are based on top 2.6.35, so you would
do:

git diff v2.6.35..origin/devel/xen-pcifront-0.5

and you would get the one big mega patch for the driver. Thought
don't forget you also need the SWIOTLB/Xen-SWIOTLB stuff (which is now
upstream in 2.6.36-rc0).

To make folks life easier I did setup branches which have all of those
patches in one location. They are:
  devel/merge.2.6.34
  devel/merge.2.6.35
  devel/merge.2.6.35-rc6.t2
  pv/merge.2.6.32
  pv/merge.2.6.33

> 
> You can also git fetch a vanilla tree into the same checkout, and then
> git diff the two branches.

<nods>

git question

[Jes Sorensen]

Hi,

I was trying to checkout a copy of Tony's release tree, but I get a
strange error when doing so.

Anyone know how to get around this, or is it not possible to do so?

first:
git-clone rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
then:
[jes@tomahawk linux-2.6]$ git-pull
fatal: Needed a single revision
Pulling into a black hole?

???

Thanks,
Jes

Re: git question

[Jes Sorensen]

>>>>> "Jes" = Jes Sorensen <jes@sgi.com> writes:

Jes> Anyone know how to get around this, or is it not possible to do
Jes> so?

Jes> first: git-clone
Jes> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
Jes> then: [jes@tomahawk linux-2.6]$ git-pull fatal: Needed a single
Jes> revision Pulling into a black hole?

Matthew suggested that I use git: of rsync: and strangely enough that
works. Baffling, but hey, I now have what I wanted ;)

Thanks,
Jes

RE: git question

[Luck, Tony]

Jes> first: git-clone
Jes> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
Jes> then: [jes@tomahawk linux-2.6]$ git-pull fatal: Needed a single
Jes> revision Pulling into a black hole?

Jes> Matthew suggested that I use git: of rsync: and strangely enough that
Jes> works. Baffling, but hey, I now have what I wanted ;)

I'm not sure what happened.  I did swap-out my links to the packfiles in
Linus' tree ... but I ran the "git prune" and "git-update-server-info"
afterwards.  So the tree should have been consistent (but possibly might
have had some objects in the packfiles that might not have been needed
by the heads in my tree if Linus was ahead of my tree).

In general the "rsync:" protocol should be the lowest overhead for a
fresh clone, but "git:" should be better for subsequent pulls and fetches.

-Tony

Re: git question

[Jes Sorensen]

Hmmm

Another git issue:

[jes@tomahawk linux-2.6]$ git-pull
fatal: read error (Connection reset by peer)
Fetch failure: git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git

Anyone seen that one before? Worked last week.

Thanks,
Jes

RE: git question

[Luck, Tony]

> Another git issue:
>
> [jes@tomahawk linux-2.6]$ git-pull
> fatal: read error (Connection reset by peer)
> Fetch failure: git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
> 
> Anyone seen that one before? Worked last week.

Not my fault (this time).  I haven't pushed anything up to kernel.org
(or made any other repo changes) since Feb 18th.  The version of git
on kernel.org was updated to 1.2.3 on Feb 23rd. What date was your last
good pull?

-Tony

Re: git question

[Jes Sorensen]

Luck, Tony wrote:
>>Another git issue:
>>
>>[jes@tomahawk linux-2.6]$ git-pull
>>fatal: read error (Connection reset by peer)
>>Fetch failure: git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
>>
>>Anyone seen that one before? Worked last week.
> 
> 
> Not my fault (this time).  I haven't pushed anything up to kernel.org
> (or made any other repo changes) since Feb 18th.  The version of git
> on kernel.org was updated to 1.2.3 on Feb 23rd. What date was your last
> good pull?

Hmm I wonder if thats it. I had a good pull on Thursday for sure, but
I think I did on Friday as well. Someone else reported problems against
other repos.

It seems that if one keeps retrying, eventually it will work, but it
seems very random.

Cheers,
Jes

RE: git question

[Luck, Tony]

> It seems that if one keeps retrying, eventually it will work, but it
> seems very random.

Perhaps there is something wrong on one of the kernel.org front-end
systems.  You can force a specific one using git1.kernel.org or
git2.kernel.org

-Tony