Skip to main content

User login

What is OpenID?
  • Log in using OpenID
  • Cancel OpenID login
  • Create new account
  • Request new password
Register
  • Home
  • Browse
    • 2D Art
    • 3D Art
    • Concept Art
    • Textures
    • Music
    • Sound Effects
    • Documents
    • Featured Tutorials
  • Submit Art
  • Collect
    • My Collections
    • Art Collections
  • Forums
  • FAQ
  • Leaderboards
    • All Time
      • Total Points
      • Comments
      • Favorites (All)
      • Favorites (2D)
      • Favorites (3D)
      • Favorites (Concept Art)
      • Favorites (Music)
      • Favorites (Sound)
      • Favorites (Textures)
    • Weekly
      • Total Points
      • Comments
      • Favorites (All)
      • Favorites (2D)
      • Favorites (3D)
      • Favorites (Concept Art)
      • Favorites (Music)
      • Favorites (Sound)
      • Favorites (Textures)
  • ❤ Donate
FLARE [ARCHIVED]

How to add more remote branches to flare-game.

shirish
Friday, September 20, 2013 - 10:17

Hi all,

Stefan Bellar was kind enough to make a git-bundle of the current repo. but for some reason it doesn't have references to the other branches.

Verifying the bundle before un-bundling was done like this :-

:~/games$ git bundle verify flare-game.bundle
The bundle contains this ref:
e91152cefbb4fee50351ed2664f0d605f38e9fb1 refs/heads/master
The bundle records a complete history.
flare-game.bundle is okay

Unbundling the git-bundle was done like this :-

:~/games$ git clone flare-game.bundle
Cloning into 'flare-game'...
Receiving objects: 100% (29726/29726), 557.97 MiB | 32.76 MiB/s, done.
Resolving deltas: 100% (19887/19887), done.
Checking connectivity... done
warning: remote HEAD refers to nonexistent ref, unable to checkout.

As can be seen it says the remote head has some issue.

$ gi
== Remote URL:
origin    /home/shirish/games/flare-game.bundle (fetch)
origin    /home/shirish/games/flare-game.bundle (push)

== Remote Branches:
  origin/master

== Local Branches:

== Most Recent Commit
fatal: bad default revision 'HEAD'

Type 'git log' for more commits, or 'git show' for full commit details.

same can be seen in most recent commit.

The URL for the Remote branch would not have been correct if I had not changed the details in ~/games/flare-game/.git/config file.

~/games/flare-game/.git$ cat config
[core]
    repositoryformatversion = 0
    filemode = true
    bare = false
    logallrefupdates = true
[remote "origin"]
    url = https://github.com/clintbellanger/flare-game.git
    fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
    remote = origin
    merge = refs/heads/master

~/games/flare-game$ gi
== Remote URL:
origin    https://github.com/clintbellanger/flare-game.git (fetch)
origin    https://github.com/clintbellanger/flare-game.git (push)

== Remote Branches:
  origin/master

== Local Branches:
* master

== Most Recent Commit
commit e91152cefbb4fee50351ed2664f0d605f38e9fb1
Merge: 85f535e 044d946
Author: Justin Jacobs <jajdorkster@gmail.com>
Date:   Sat Aug 24 05:46:10 2013 -0700

    Merge pull request #350 from stefanbeller/master
   
    Correct the option 2 for playing the game without installing

Type 'git log' for more commits, or 'git show' for full commit details.

Now as can be seen in the Remote branches it shows only origin/master.

Now I do not know a better way to do it. At least it seems to work.

~/games/flare-game$ git pull origin master
From https://github.com/clintbellanger/flare-game
 * branch            master     -> FETCH_HEAD
Already up-to-date.

I actually would not know if this would work or not unless somebody makes a commit or two and then I try go pull and merge it in my repo.

From the github site, at least three other branches exist and am sure in future more branches will come :-

branch 0.17
branch 0.18
empyrean

  • Log in or register to post comments
shirish
joined 15 years 1 month ago
Friday, September 20, 2013 - 11:28

Update: Just did a fetch and it did :-

~/games/flare-game$ git fetch
remote: Counting objects: 256, done.
remote: Compressing objects: 100% (95/95), done.
remote: Total 161 (delta 96), reused 130 (delta 65)
Receiving objects: 100% (161/161), 71.71 KiB | 90.00 KiB/s, done.
Resolving deltas: 100% (96/96), completed with 42 local objects.
From https://github.com/clintbellanger/flare-game
 * [new branch]      branch0.17 -> origin/branch0.17
 * [new branch]      branch0.18 -> origin/branch0.18
 * [new branch]      empyrean   -> origin/empyrean
 * [new tag]         v0.14      -> v0.14
 * [new tag]         v0.15      -> v0.15
 * [new tag]         v0.16      -> v0.16
 * [new tag]         v0.17      -> v0.17
 * [new tag]         v0.17.1    -> v0.17.1
 * [new tag]         v0.18      -> v0.18

  • Log in or register to post comments
shirish
joined 15 years 1 month ago
Friday, September 20, 2013 - 16:46

Hi all,

This is especially for clint bellanger and stefan bellar .

It seems the correct way to make the bundle was :-

git bundle create flare-game.bundle --all

This would have been the comprehensive bundle .

@Stefan, can you check how much diff. (if any) is it to the bundle if you use the --all option. The bundle you had created (and I pulled) was 558 MB .

Looking forward to know more.

  • Log in or register to post comments
Stefan Beller
joined 13 years 5 months ago
Saturday, September 21, 2013 - 00:56

Using git bundle create flare-game.bundle --all yields here 637M.

  • Log in or register to post comments