[Bps-public-commit] git-sync branch, master, updated. 1da0493c51eeb746926dfdbb5956242bc478b4d5

[Alex Vandiver]

The branch, master has been updated
       via  1da0493c51eeb746926dfdbb5956242bc478b4d5 (commit)
       via  2c965dbf4d4a7f7e22cf19e6a3c0531f616bdebc (commit)
      from  74ae0c78f5cad7519141a9f02e7079d62f7857a4 (commit)

Summary of changes:
 git-sync |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 2c965dbf4d4a7f7e22cf19e6a3c0531f616bdebc
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Nov 29 17:18:48 2010 -0500

    Switch to `git fetch --all` instead of `git remote update`
    
    This re-applies 8ec1190; the feature has been in git since 1.6.6 (Dec 23 2009)

diff --git a/git-sync b/git-sync
index af74d0c..ebc65b6 100755
--- a/git-sync
+++ b/git-sync
@@ -15,15 +15,15 @@ with their upstream repositories, and to clone new repositories as
 they are added to the upstream location.
 
 The updating is done in a manner which preserves your local state, and
-I<should> not cause conflicts.  A C<git remote update --prune> is always done;
-if the user has no uncommitted changes, and the merge would be a
+I<should> not cause conflicts.  A C<git fetch --all --prune> is always
+done; if the user has no uncommitted changes, and the merge would be a
 fast-forward, the current branch is C<git pull>ed, and the diffstat is
 printed.  Otherwise, the state of the repository is shown in a concise
 manner.
 
 C<git-sync> also understands C<git-svn> clones, and updates them using
 the same rules, but using C<git svn fetch> and C<git svn rebase>
-instead of C<git remote update> and C<git pull>.
+instead of C<git fetch> and C<git pull>.
 
 There are three configuration modes:
 
@@ -375,7 +375,7 @@ sub add_github_remotes {
             $remote => $uri,
         );
     }
-    my $retval = eval { $repo->command( [qw/remote update --prune/], STDERR => 0 ); }
+    my $retval = eval { $repo->command( [qw/fetch --all --prune/], STDERR => 0 ); }
         if $config{fetch};
 
     print colored("{ @network }\n", "dark green");
@@ -522,7 +522,7 @@ sub update {
          # git-svn doesn't work with $repo->command, hate
         `git --git-dir @{[$repo->repo_path]} svn fetch -q` unless $pretend;
     } else {
-        my $ret = eval { $repo->command( [qw/remote update --prune/], STDERR => 0 ); } unless $pretend;
+        my $ret = eval { $repo->command( [qw/fetch --all --prune/], STDERR => 0 ); } unless $pretend;
     }
     kill $? & 127, $$ if $? & 127; # Propagate the signal it died with, if any
 

commit 1da0493c51eeb746926dfdbb5956242bc478b4d5
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Nov 29 17:20:10 2010 -0500

    Fetch updated tags as well

diff --git a/git-sync b/git-sync
index ebc65b6..9946200 100755
--- a/git-sync
+++ b/git-sync
@@ -15,11 +15,11 @@ with their upstream repositories, and to clone new repositories as
 they are added to the upstream location.
 
 The updating is done in a manner which preserves your local state, and
-I<should> not cause conflicts.  A C<git fetch --all --prune> is always
-done; if the user has no uncommitted changes, and the merge would be a
-fast-forward, the current branch is C<git pull>ed, and the diffstat is
-printed.  Otherwise, the state of the repository is shown in a concise
-manner.
+I<should> not cause conflicts.  A C<git fetch --all --tags --prune> is
+always done; if the user has no uncommitted changes, and the merge
+would be a fast-forward, the current branch is C<git pull>ed, and the
+diffstat is printed.  Otherwise, the state of the repository is shown
+in a concise manner.
 
 C<git-sync> also understands C<git-svn> clones, and updates them using
 the same rules, but using C<git svn fetch> and C<git svn rebase>
@@ -375,7 +375,7 @@ sub add_github_remotes {
             $remote => $uri,
         );
     }
-    my $retval = eval { $repo->command( [qw/fetch --all --prune/], STDERR => 0 ); }
+    my $retval = eval { $repo->command( [qw/fetch --all --tags --prune/], STDERR => 0 ); }
         if $config{fetch};
 
     print colored("{ @network }\n", "dark green");
@@ -522,7 +522,7 @@ sub update {
          # git-svn doesn't work with $repo->command, hate
         `git --git-dir @{[$repo->repo_path]} svn fetch -q` unless $pretend;
     } else {
-        my $ret = eval { $repo->command( [qw/fetch --all --prune/], STDERR => 0 ); } unless $pretend;
+        my $ret = eval { $repo->command( [qw/fetch --all --tags --prune/], STDERR => 0 ); } unless $pretend;
     }
     kill $? & 127, $$ if $? & 127; # Propagate the signal it died with, if any
 

-----------------------------------------------------------------------