Skip to content

Commit

Permalink
gituptodate: Assorted fixes added branches
Browse files Browse the repository at this point in the history
* Reverse handling
  - first take care of tgt
  - then osc-osd + submodule update
* Add Some more exported branches

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
  • Loading branch information
Boaz Harrosh committed Jan 7, 2010
1 parent 60eb143 commit 4aa3fa9
Showing 1 changed file with 24 additions and 19 deletions.
43 changes: 24 additions & 19 deletions gituptodate
Original file line number Diff line number Diff line change
@@ -1,32 +1,37 @@
#!/bin/bash
#
#del all tags
git-tag -d `git-tag -l`
# update
git-remote update
git-remote prune origin

# *(no branch)
git-checkout origin/master
cd tgt

git-branch -f master origin/master
git-branch -f osc origin/osc
#del all tags
git tag -d `git tag -l`
#Update
git remote update
git remote prune origin

git branch -f osd-old origin/osd-old
git branch -f from-tomo origin/from-tomo
git branch -f osd origin/osd
git branch -f osd-next origin/osd-next
echo ===========================================================================
git branch -a -v
echo ===========================================================================

# Update tgt submodule also
git-submodule update
cd tgt
cd ..

#delete old branches
git-remote prune origin
#del all tags
git tag -d `git tag -l`
# update
git remote update
git remote prune origin

git-branch -f from-tomo origin/from-tomo
git-branch -f osd origin/osd
git-branch -f osd-old origin/osd-old
# *(no branch)
git checkout origin/master
git submodule update

git branch -f osc origin/osc
git branch -f master origin/master
git branch -f john-sg origin/john-sg
echo ===========================================================================
git branch -a -v
echo ===========================================================================

cd ..

0 comments on commit 4aa3fa9

Please sign in to comment.