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
3029385d
Commit
3029385d
authored
Jul 27, 2012
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gpull: do not use origin as default
parent
14606a15
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
gpull
bin/gpull
+9
-4
No files found.
bin/gpull
View file @
3029385d
...
...
@@ -21,7 +21,7 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
exit
1
fi
REPO
=
origin
REPO
=
if
[
"
$1
"
=
"-a"
]
;
then
ALLBRANCHES
=
1
...
...
@@ -69,6 +69,7 @@ pull_all_branches()
# Если не получилось получить обновление по такому же названию бранча, как локальный, то получаем по удалённому
pull_from_unique_branch
()
{
[
-n
"
$REPO
"
]
||
return
REMOTEBRANCH
=
$(
git branch
-a
|
grep
"^ remotes/
$REPO
/"
|
sed
-e
"s|.*remotes/
$REPO
/||"
)
docmd git pull
$REBASE
$REPO
$REMOTEBRANCH
}
...
...
@@ -80,8 +81,11 @@ fi
REMOTEBRANCH
=
"
$1
"
# use current branch name as default
[
-n
"
$REMOTEBRANCH
"
]
||
REMOTEBRANCH
=
$(
get_current_branch
)
# Only if set REPO
if
[
-n
"
$REPO
"
]
;
then
# use current branch name as default
[
-n
"
$REMOTEBRANCH
"
]
||
REMOTEBRANCH
=
$(
get_current_branch
)
fi
if
[
-n
"
$CHECKRESULT
"
]
;
then
# Quiet in check mode
...
...
@@ -99,4 +103,5 @@ docmd git fetch $REPO || exit
docmd git pull
$REBASE
$REPO
$REMOTEBRANCH
||
pull_from_unique_branch
||
exit
# REWRITE ME: assure we get tags
docmd git pull
--tags
$REPO
$REMOTEBRANCH
#docmd git pull --tags $REPO $REMOTEBRANCH
docmd git fetch
--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