Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
3a40456f
Commit
3a40456f
authored
Dec 03, 2012
by
Simon Marlow
Browse files
Make "sync-all pull --rebase" work
By filtering out the --rebase when fetching submodules
parent
31d771be
Changes
1
Hide whitespace changes
Inline
Side-by-side
sync-all
View file @
3a40456f
...
...
@@ -380,15 +380,19 @@ sub scmall {
}
elsif
(
$command
eq
"
pull
")
{
my
$realcmd
;
my
@realargs
;
if
(
$remotepath
eq
"
-
")
{
# Only fetch for the submodules. "git submodule update"
# will take care of making us point to the right commit.
$realcmd
=
"
fetch
";
# we like "sync-all pull --rebase" to work:
@realargs
=
grep
(
!
/--rebase/
,
@args
);
}
else
{
$realcmd
=
"
pull
";
@realargs
=
@args
;
}
scm
(
$localpath
,
$scm
,
$realcmd
,
@args
);
scm
(
$localpath
,
$scm
,
$realcmd
,
@
real
args
);
}
elsif
(
$command
eq
"
new-workdir
")
{
gitNewWorkdir
(
$localpath
,
@args
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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