Using Git

cfdphil · February 13, 2009, 06:10

Hi,

I've used the git facility and cloned a version of OpenFoam-1.5.x on my machine. If I try and use the command below to update the download then I get the error below. Any ideas why that is?

Command:
git pull git://repo.or.cz/OpenFOAM-1.5.x.git

Error:
fatal: Not a git repository (or any of the parent directories): .git

Thanks,
Phil

lin · February 13, 2009, 10:03

You need to enter the Openfoam directory and then run "git pull"

cfdphil · February 13, 2009, 12:05

Ah yes, that works. Thanks.

However, it then asks me which branch I want to merge with. What do I do for that?

lin · February 13, 2009, 14:57

Please read my one line post again.

cfdphil · February 16, 2009, 10:20

Got it. Thanks.

hellorishi · February 25, 2009, 12:12

I am a bit confused.I would like to know the difference between the various verions of OF-1.5

I saw following :
- patch version (on sourceforge),
http://openfoam-extend.svn.sourceforge.net/viewvc/openfoam-extend/branches/OpenC FD_Release/OpenFOAM-1.5_patch/
- git,
- dev on Hrvoje's site
http://powerlab.fsb.hr/ped/kturbo/OpenFOAM/release/

Is the GIT and patch version the same? If one doesnt have GIT access, can one download the tar-balls of patch ?

Kindly shed some light.
thanks

gschaider · February 26, 2009, 10:06

Hi Rishi!

There is the Released Version by OpenCFD. For that they they keep a git with all the latest bug-fixes.

Before 1.5 the bug-fixes were only on the message board and the patch-version was an effort to collect all these patches in one place. It is now obsolete (as installing patches now is possible from one place) and will be retired. (Or in other words: No. Git and Patch are not the same)

The powerlab-stuff is AFAIK the Git-stuff supplemented with Hrv's own development. The relationship to the Git-branch is AFAIK strictly downstream

AFAIK know there is a possibility to generate a tar-ball from a git-archive. Maybe somebody with enough time and bandwidth can write a script that automatically pulls such a tar-ball from the repository and puts it on some webserver.
Generating a patch from the Git that patches a vanilla 1.5-release version is in my opinion a bit more tricky because the initial state of the Git archive is a bit different from a vanilla release so a patch "latest revision"-"initial revision" wouldn't bring a vanilla release to exactly the same state as "latest revision". Plus there is the problem that the normal patch-utility doesn't react well to newly created files (the first application of the patch creates the file alright, the second application appends the contents for a second time). That was one of the problems I had with the patch-release (but maybe I was just using the patch-utility wrong)

Bernhard

PS: AFAIK is AFAIK the commonly accepted abbreviation for "As far as I know" ;)

gschaider · February 26, 2009, 10:11

News update: Go to http://repo.or.cz/w/OpenFOAM-1.5.x.git

You can get diffs and tarballs there

Bernhard

hellorishi · March 5, 2009, 05:29

Hello Bernhard,

Thanks for your help and explaination.
I am not familiar with working of GIT, so some more doubts...

If I download the tarballs from this page (latest). Do I have all the patches from July 2008(website) version ? I have doubt since this tarball seems a bit small ~35MB and has mostly the /application/solver files.

http://repo.or.cz/w/OpenFOAM-1.5.x.git?a=commit;h=6b5b3ee454a8ae2795e3c47fd9e7c404300fe5ab

Thanks
Rishi

gschaider · March 5, 2009, 07:44

Hi Rishi!

I guess it is everything except the ThirdParty-stuff .... just the sources (so you'll have to compile it). So 35MB seems OK to me. Should be a fully patched version. But I haven't tried that webinterface to Git yet (and in the long run you'll be happier if you pull the git-version the way it is described on the OF-download-page)

Bernhard

February 13, 2009, 06:10	Hi, I've used the git facil	#1
cfdphil New Member cfdphil Join Date: Mar 2009 Posts: 8 Rep Power: 17	Hi, I've used the git facility and cloned a version of OpenFoam-1.5.x on my machine. If I try and use the command below to update the download then I get the error below. Any ideas why that is? Command: git pull git://repo.or.cz/OpenFOAM-1.5.x.git Error: fatal: Not a git repository (or any of the parent directories): .git Thanks, Phil

February 13, 2009, 10:03	You need to enter the Openfoam	#2
lin Senior Member Hua Zen Join Date: Mar 2009 Posts: 138 Rep Power: 17	You need to enter the Openfoam directory and then run "git pull"

February 13, 2009, 12:05	Ah yes, that works. Thanks.	#3
cfdphil New Member cfdphil Join Date: Mar 2009 Posts: 8 Rep Power: 17	Ah yes, that works. Thanks. However, it then asks me which branch I want to merge with. What do I do for that?

February 13, 2009, 14:57	Please read my one line post a	#4
lin Senior Member Hua Zen Join Date: Mar 2009 Posts: 138 Rep Power: 17	Please read my one line post again.

February 16, 2009, 10:20	Got it. Thanks.	#5
cfdphil New Member cfdphil Join Date: Mar 2009 Posts: 8 Rep Power: 17	Got it. Thanks.

February 25, 2009, 12:12	I am a bit confused.I would li	#6
hellorishi Senior Member Rishi . Join Date: Mar 2009 Posts: 149 Rep Power: 17	I am a bit confused.I would like to know the difference between the various verions of OF-1.5 I saw following : - patch version (on sourceforge), http://openfoam-extend.svn.sourceforge.net/viewvc/openfoam-extend/branches/OpenC FD_Release/OpenFOAM-1.5_patch/ - git, - dev on Hrvoje's site http://powerlab.fsb.hr/ped/kturbo/OpenFOAM/release/ Is the GIT and patch version the same? If one doesnt have GIT access, can one download the tar-balls of patch ? Kindly shed some light. thanks

February 26, 2009, 10:06	Hi Rishi! There is the Rele	#7
gschaider Assistant Moderator Bernhard Gschaider Join Date: Mar 2009 Posts: 4,225 Rep Power: 51	Hi Rishi! There is the Released Version by OpenCFD. For that they they keep a git with all the latest bug-fixes. Before 1.5 the bug-fixes were only on the message board and the patch-version was an effort to collect all these patches in one place. It is now obsolete (as installing patches now is possible from one place) and will be retired. (Or in other words: No. Git and Patch are not the same) The powerlab-stuff is AFAIK the Git-stuff supplemented with Hrv's own development. The relationship to the Git-branch is AFAIK strictly downstream AFAIK know there is a possibility to generate a tar-ball from a git-archive. Maybe somebody with enough time and bandwidth can write a script that automatically pulls such a tar-ball from the repository and puts it on some webserver. Generating a patch from the Git that patches a vanilla 1.5-release version is in my opinion a bit more tricky because the initial state of the Git archive is a bit different from a vanilla release so a patch "latest revision"-"initial revision" wouldn't bring a vanilla release to exactly the same state as "latest revision". Plus there is the problem that the normal patch-utility doesn't react well to newly created files (the first application of the patch creates the file alright, the second application appends the contents for a second time). That was one of the problems I had with the patch-release (but maybe I was just using the patch-utility wrong) Bernhard PS: AFAIK is AFAIK the commonly accepted abbreviation for "As far as I know" ;) __________________ Note: I don't use "Friend"-feature on this forum out of principle. Ah. And by the way: I'm not on Facebook either. So don't be offended if I don't accept your invitation/friend request

February 26, 2009, 10:11	News update: Go to http://repo	#8
gschaider Assistant Moderator Bernhard Gschaider Join Date: Mar 2009 Posts: 4,225 Rep Power: 51	News update: Go to http://repo.or.cz/w/OpenFOAM-1.5.x.git You can get diffs and tarballs there Bernhard __________________ Note: I don't use "Friend"-feature on this forum out of principle. Ah. And by the way: I'm not on Facebook either. So don't be offended if I don't accept your invitation/friend request

March 5, 2009, 05:29	Hello Bernhard, Thanks for	#9
hellorishi Senior Member Rishi . Join Date: Mar 2009 Posts: 149 Rep Power: 17	Hello Bernhard, Thanks for your help and explaination. I am not familiar with working of GIT, so some more doubts... If I download the tarballs from this page (latest). Do I have all the patches from July 2008(website) version ? I have doubt since this tarball seems a bit small ~35MB and has mostly the /application/solver files. http://repo.or.cz/w/OpenFOAM-1.5.x.git?a=commit;h=6b5b3ee454a8ae2795e3c47fd9e7c404300fe5ab Thanks Rishi

March 5, 2009, 07:44	Hi Rishi! I guess it is eve	#10
gschaider Assistant Moderator Bernhard Gschaider Join Date: Mar 2009 Posts: 4,225 Rep Power: 51	Hi Rishi! I guess it is everything except the ThirdParty-stuff .... just the sources (so you'll have to compile it). So 35MB seems OK to me. Should be a fully patched version. But I haven't tried that webinterface to Git yet (and in the long run you'll be happier if you pull the git-version the way it is described on the OF-download-page) Bernhard __________________ Note: I don't use "Friend"-feature on this forum out of principle. Ah. And by the way: I'm not on Facebook either. So don't be offended if I don't accept your invitation/friend request