Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
korinf
etersoft-build-utils
Commits
3bbc8263
You need to sign in or sign up before continuing.
Commit
3bbc8263
authored
Jun 02, 2012
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gpull: use remote branch name if local name does not exists there
parent
15a9ba3f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
gpull
bin/gpull
+9
-1
No files found.
bin/gpull
View file @
3bbc8263
...
...
@@ -66,6 +66,13 @@ pull_all_branches()
docmd git checkout
$CURRENTBRANCH
}
# Если не получилось получить обновление по такому же названию бранча, как локальный, то получаем по удалённому
pull_from_unique_branch
()
{
REMOTEBRANCH
=
$(
git branch
-a
|
grep
"^ remotes/
$REPO
/"
|
sed
-e
"s|.*remotes/
$REPO
/||"
)
docmd git pull
$REBASE
$REPO
$REMOTEBRANCH
}
if
[
-n
"
$ALLBRANCHES
"
]
;
then
pull_all_branches
exit
...
...
@@ -86,7 +93,8 @@ if [ -n "$CHECKRESULT" ] ; then
fi
docmd git fetch
$REPO
||
exit
docmd git pull
$REBASE
$REPO
$REMOTEBRANCH
||
exit
# FIXME: Не факт, что удалённо бранч называется именно $REMOTEBRANCH
docmd git pull
$REBASE
$REPO
$REMOTEBRANCH
||
pull_from_unique_branch
||
exit
# REWRITE ME: assure we get tags
docmd git pull
--tags
$REPO
$REMOTEBRANCH
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment