Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ccce9fe6d3f5508412d3229151763355c440d27d

>---------------------------------------------------------------

commit ccce9fe6d3f5508412d3229151763355c440d27d
Author: Ian Lynagh <i...@well-typed.com>
Date:   Sun Dec 2 17:44:04 2012 +0000

    When pulling, only 'fetch' in submodules

>---------------------------------------------------------------

 sync-all |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/sync-all b/sync-all
index 04bbd19..4a8387d 100755
--- a/sync-all
+++ b/sync-all
@@ -379,7 +379,16 @@ sub scmall {
             scm ($localpath, $scm, "push", @args);
         }
         elsif ($command eq "pull") {
-            scm ($localpath, $scm, "pull", @args);
+            my $realcmd;
+            if ($remotepath eq "-") {
+                # Only fetch for the submodules. "git submodule update"
+                # will take care of making us point to the right commit.
+                $realcmd = "fetch";
+            }
+            else {
+                $realcmd = "pull";
+            }
+            scm ($localpath, $scm, $realcmd, @args);
         }
         elsif ($command eq "new-workdir") {
             gitNewWorkdir ($localpath, @args);



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to