Root Git & Github questions

[g60madman]

I believe his problem is that he didn't use git@github.com:username/remote_repo_name.git. Unless I'm mistaken

Yeah if he is downloading the repo from his github then yes he would want to do that.

git clone git@github.com:username/remote_repo_name.git

However I am not sure if this is a new repo or not?

 

[dsmryder]

I'm not sure where I am any more. LOL
What I did was make changes to my remote and to my local with out sync'ing. On top of that I must of done something to my ssh keys.
I am working through it, but I'm not sure where I am on this, I think I need to try and pull or something.

I wish I could make a new file on the remote without doing it on the local first. My family pulls me away so I can't keep track of what I am doing sometimes. That's what I get for trying to be a good father and husband

 

[rukin5197]

Yeah if he is downloading the repo from his github then yes he would want to do that.

git clone git@github.com:username/remote_repo_name.git

However I am not sure if this is a new repo or not?

I was referring to:
git remote add origin git@github.com:username/remote_repo_name.git
then do all of that and end with:
git push -f origin
(I like to put the -f just in case.)

 

[dsmryder]

I was referring to:
git remote add origin git@github.com:username/remote_repo_name.git
then do all of that and end with:
git push -f origin
(I like to put the -f just in case.)

Yeah, I forced the push. I just had to do something else again. no biggie.

On a brighter note, I should be able to build and have boot sounds without adding a script.

 

[b_randon14]

Hey guys I just pushed to my github a set of build scripts I made does building and maintaining my repos and you all are more than welcone to use them. You will have to tweak them to your liking but I tried to make them pretty user friendly!

https://github.com/brandon14/build-scripts

 

[rukin5197]

Hey guys I just pushed to my github a set of build scripts I made does building and maintaining my repos and you all are more than welcone to use them. You will have to tweak them to your liking but I tried to make them pretty user friendly!

https://github.com/brandon14/build-scripts

Its gonna be quite a few edits for aokp, but thanks.

Sent from my Motorola Triumph using Tapatalk

 

[b_randon14]

Yeah like I said it needs some tweaking for e ergone else. I mainly like having all those functions in one script!

 

[dsmryder]

I am adding this for completeness. If you are pushing up to your remote, and you don't have a branch, you don't need to state the branch.

git push github

and you're done!
I'm glad I tried this. I have a bunch of code that has no branch and I was tired of adding branches.

 

[mantera]

I am adding this for completeness. If you are pushing up to your remote, and you don't have a branch, you don't need to state the branch.

git push github

and you're done!
I'm glad I tried this. I have a bunch of code that has no branch and I was tired of adding branches.

Well, you always have to have a branch in order to be able to commit anything. However, whenever you create a repo, it automatically creates a branch named "master". If your current local branch name matches the branch on github, then yes, you don't need to type in the branch name when doing a push to github.

 

[dsmryder]

Well, you always have to have a branch in order to be able to commit anything. However, whenever you create a repo, it automatically creates a branch named "master". If your current local branch name matches the branch on github, then yes, you don't need to type in the branch name when doing a push to github.

When I run

git branch

on some of my prodjects it returns

* (no branch)

and what I was doing was adding a branc, then pushing that. So is it just understanding "mastrer" for me. I do see that on github it would put the changes to the right place. It seems that on the local, sense I have been downloading with gingerbread as my default, git does a lot of work for me.
Cool!

 

[Chairshot215]

Thanks for this entire conversation. Still somewhat lost but much better off then I would have been had this conversation never taken place. Have been backing up the entire Android Directory to an external after confirming I have not broke anything and then just copying and replacing the files that had been changed from the backup directory when I do. Besides just learning the proper way of doing things this seems like a much better way of organizing compared to the bastardization of processes I'm currently using.

On a brighter note, I should be able to build and have boot sounds without adding a script.

Once I'm all straightened out would very much like to try and Kang this with your permission? Assuming I'm understanding the definition of Kang correctly that is. Otherwise have been adding the scripts along with a few .9 images from Froyo that cause errors after the build has completed. Will also need to find a equally informative conversation dealing with Eclipse which is next on the list of things I would like to learn.

 

[g60madman]

Thanks for this entire conversation. Still somewhat lost but much better off then I would have been had this conversation never taken place. Have been backing up the entire Android Directory to an external after confirming I have not broke anything and then just copying and replacing the files that had been changed from the backup directory when I do. Besides just learning the proper way of doing things this seems like a much better way of organizing compared to the bastardization of processes I'm currently using.

Yeah it takes a while to figure out github and once you get it down it's much easier to use and mange your project. If you have any questions please don't hesitate to post. The more we talk the more we all know. It's nice to see how each dev does it. Nothing wrong with making our community stronger

 

[dsmryder]

Thanks for this entire conversation. Still somewhat lost but much better off then I would have been had this conversation never taken place. Have been backing up the entire Android Directory to an external after confirming I have not broke anything and then just copying and replacing the files that had been changed from the backup directory when I do. Besides just learning the proper way of doing things this seems like a much better way of organizing compared to the bastardization of processes I'm currently using.




Once I'm all straightened out would very much like to try and Kang this with your permission? Assuming I'm understanding the definition of Kang correctly that is. Otherwise have been adding the scripts along with a few .9 images from Froyo that cause errors after the build has completed. Will also need to find a equally informative conversation dealing with Eclipse which is next on the list of things I would like to learn.

I'd love to give you my permission, but I just parsed a script that someone else made. So, yeah, go ahead and use it

 

[Chairshot215]

Yeah it takes a while to figure out github and once you get it down it's much easier to use and mange your project. If you have any questions please don't hesitate to post. The more we talk the more we all know. It's nice to see how each dev does it. Nothing wrong with making our community stronger

Thanks, am about to blow up the development thread in a minute. Have spent the last few days trying to consolidate all my changes and start fresh building entirely from Source. Started using Apktool in the beginning because of the availability of resources and if I made a mistake decompiling & compiling an APK takes my Puter about 2 minutes compared to the 2 hours it takes to rebuild the source. Later needed to start building parts from source like Android.policy.jar & CMParts. Found that for tasks outside what I guess would be considered standard theming working with source is much easier than trying to figure out what

 

[g60madman]

Blow it up

:thrasher:

 

[dsmryder]

The git reference mantera linked to seems dead. I found a manual page for git.

 

[dsmryder]

I've become confused again. I am trying to use a certain branch (klingon) while building (DeskClock).
I have tried to checkout the branch (klingon), merge the branch (while on the "no branch" branch) and I think if I do this it should drag over the changes to the gingerbread branch on github. Should I make a gingerbread branch on my local and use that to merge and push?

Edit: Like I thought, sense I wasn't trying to push to a branch, it wouldn't push. I added a gingerbread branch to the project and now all is like I expect.

 

[dsmryder]

I have lost the ablillity to build based off of my repo. I get an error saying I have a malformed file.
I'll post the error when I'm done sync'ing a test folder. I've looked over my last few commits and I don't see anything.

Any direction will be soooooo appreciated.

Edit:

04:36:04_~/aa$ . build/envsetup.sh && brunch triumph -j2
including device/motorola/triumph/vendorsetup.sh
including vendor/cyanogen/vendorsetup.sh
including vendor/cyanogen/vendorsetup.sh
build/core/product_config.mk:198: *** vendor/cyanogen/products/cyanogen_triumph.mk: malformed COPY_FILE "\".  Stop.
Device triumph not found. Attempting to retrieve device repository from CyanogenMod Github (http://github.com/CyanogenMod).
Traceback (most recent call last):
  File "build/tools/roomservice.py", line 16, in <module>
    result = json.loads(urllib2.urlopen("http://github.com/api/v2/json/repos/show/CyanogenMod?page=%d" % page).read())
  File "/usr/lib/python2.6/urllib2.py", line 126, in urlopen
    return _opener.open(url, data, timeout)
  File "/usr/lib/python2.6/urllib2.py", line 397, in open
    response = meth(req, response)
  File "/usr/lib/python2.6/urllib2.py", line 510, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.6/urllib2.py", line 435, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.6/urllib2.py", line 369, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.6/urllib2.py", line 518, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 404: Not Found
build/core/product_config.mk:198: *** vendor/cyanogen/products/cyanogen_triumph.mk: malformed COPY_FILE "\".  Stop.

** Don't have a product spec for: 'cyanogen_triumph'
** Do you have the right repo manifest?

No such item in brunch menu. Try 'breakfast'

I have been trying to switch folders from a project that builds (g60's r0.8+some changes) and my current projuct (what's listed on my github)
I know I may have goofed up the vendor/cyanogen part when I tried to do something.

 

[g60madman]

I have lost the ablillity to build based off of my repo. I get an error saying I have a malformed file.
I'll post the error when I'm done sync'ing a test folder. I've looked over my last few commits and I don't see anything.

Any direction will be soooooo appreciated.

Once you get the error let me know.

 

[g60madman]

** Don't have a product spec for: 'cyanogen_triumph'
** Do you have the right repo manifest?

That's as easy one. By default our device is not apart of vendor/cyanogen/products/ as it's not an approved device. All you need to do is download the file and put it back in vendor/cyanogen/products/ and life should be good. Here is the file link

https://github.com/g60madman/android_vendor_cyanogen/blob/gingerbread/products/cyanogen_triumph.mk

 

[dsmryder]

That's as easy one. By default our device is not apart of vendor/cyanogen/products/ as it's not an approved device. All you need to do is download the file and put it back in vendor/cyanogen/products/ and life should be good. Here is the file link

https://github.com/g60madman/android_vendor_cyanogen/blob/gingerbread/products/cyanogen_triumph.mk

I've done a back-and-forth comparison of your and the one in my line
It's the same file and revision.

 

[g60madman]

I've done a back-and-forth comparison of your and the one in my line
It's the same file and revision.

Did you make sure to verify the file is there? It's possible you deleted it. Let me know.

 

[dsmryder]

Did you make sure to verify the file is there? It's possible you deleted it. Let me know.

It's there. I opened it up with gedit and compared it with your source from github.

https://www.dropbox.com/s/2v6fl5f3yoa98nl/Screenshot.png

I've spent a bunch of time comparing the build/core/product_config.mk, vendor/cyanogen/products/cyanogen_triumph.mk, vendor/cyanogen/vendorsetup.sh, device/motorola/triumph/vendorsetup.sh files. I've also tried to replace some of the folders (build, vindor/cyanogen, and device/motorola/triumph)

 

[dsmryder]

I just deleted my vendor_cyanogen fork and reforked g60's and it's still not building.

I don't know if anybody feels like building my version or not. I think you would still get the same errors. I'm going nuts

 

[dsmryder]

I've set up a test account on github. I hope the new forks helps me to trace this down.