Commit 3a40456f authored by Simon Marlow's avatar Simon Marlow
Browse files

Make "sync-all pull --rebase" work

By filtering out the --rebase when fetching submodules
parent 31d771be
...@@ -380,15 +380,19 @@ sub scmall { ...@@ -380,15 +380,19 @@ sub scmall {
} }
elsif ($command eq "pull") { elsif ($command eq "pull") {
my $realcmd; my $realcmd;
my @realargs;
if ($remotepath eq "-") { if ($remotepath eq "-") {
# Only fetch for the submodules. "git submodule update" # Only fetch for the submodules. "git submodule update"
# will take care of making us point to the right commit. # will take care of making us point to the right commit.
$realcmd = "fetch"; $realcmd = "fetch";
# we like "sync-all pull --rebase" to work:
@realargs = grep(!/--rebase/,@args);
} }
else { else {
$realcmd = "pull"; $realcmd = "pull";
@realargs = @args;
} }
scm ($localpath, $scm, $realcmd, @args); scm ($localpath, $scm, $realcmd, @realargs);
} }
elsif ($command eq "new-workdir") { elsif ($command eq "new-workdir") {
gitNewWorkdir ($localpath, @args); gitNewWorkdir ($localpath, @args);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment