Navigation Menu

Skip to content

Instantly share code, notes, and snippets.

@galderz
Created June 7, 2011 15:07
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save galderz/1012439 to your computer and use it in GitHub Desktop.
Save galderz/1012439 to your computer and use it in GitHub Desktop.
[z@dnb-2:~/Go/code/infinispan.git]% (t_1144) sync_with_upstream
Fetching new details from upstream
Synchronizing release branch master
error: refs/heads/t_1140 does not point to a valid object!
error: refs/heads/t_1140 does not point to a valid object!
Synchronizing release branch 4.2.x
error: refs/heads/t_1140 does not point to a valid object!
error: refs/heads/t_1140 does not point to a valid object!
Local clone and origin synced with upstream
Now rebasing all topic branches that start with 't_'
Branches are ['4.2.x', 'master', 't_1123', 't_1140_1', 't_1144', 't_scajadoc']
Analysing topic branch t_1123
> Likely release branches for topic t_1123 are {'4.2.x': 910, 'master': 1}
>Likely release branches for topic t_1123 are [(1, 'master'), (910, '4.2.x')]
Rebasing using git rebase master
error: refs/heads/t_1140 does not point to a valid object!
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:galderz/infinispan.git
37b94f6..d3e87f4 t_1123 -> t_1123
Analysing topic branch t_1140_1
> Likely release branches for topic t_1140_1 are {'4.2.x': 913, 'master': 2}
>Likely release branches for topic t_1140_1 are [(2, 'master'), (913, '4.2.x')]
Rebasing using git rebase master
error: refs/heads/t_1140 does not point to a valid object!
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:galderz/infinispan.git
+ d8fad91...d3e87f4 t_1140_1 -> t_1140_1 (forced update)
Analysing topic branch t_1144
> Likely release branches for topic t_1144 are {'4.2.x': 913, 'master': 2}
>Likely release branches for topic t_1144 are [(2, 'master'), (913, '4.2.x')]
Rebasing using git rebase master
error: refs/heads/t_1140 does not point to a valid object!
Counting objects: 29, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (16/16), 3.18 KiB, done.
Total 16 (delta 5), reused 0 (delta 0)
To git@github.com:galderz/infinispan.git
* [new branch] t_1144 -> t_1144
Analysing topic branch t_scajadoc
> Likely release branches for topic t_scajadoc are {'4.2.x': 910, 'master': 1}
>Likely release branches for topic t_scajadoc are [(1, 'master'), (910, '4.2.x')]
Rebasing using git rebase master
error: refs/heads/t_1140 does not point to a valid object!
error: refs/heads/t_1144 does not point to a valid object!
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:galderz/infinispan.git
37b94f6..d3e87f4 t_scajadoc -> t_scajadoc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment