Merge branch 'maint'

* maint:
push: mention "git pull" in error message for non-fast forwards
Standardize do { ... } while (0) style
t/t7003: replace \t with literal tab in sed expression
index-pack: Don't follow replace refs.

diff --combined builtin/push.c
index a2cc9fdea1b22739681c26ee3723058c91018d81,69bc2f27ac414ce3532f6babcc68671b0b95d65a..e655eb7695faba13c4d9e8f25b9649ffec7195be
--- 1/builtin/push.c
--- 2/builtin/push.c
+++ b/builtin/push.c
@@@ -22,13 -22,13 +22,13 @@@ static int progress
  
  static const char **refspec;
  static int refspec_nr;
 +static int refspec_alloc;
  
  static void add_refspec(const char *ref)
  {
 -      int nr = refspec_nr + 1;
 -      refspec = xrealloc(refspec, nr * sizeof(char *));
 -      refspec[nr-1] = ref;
 -      refspec_nr = nr;
 +      refspec_nr++;
 +      ALLOC_GROW(refspec, refspec_nr, refspec_alloc);
 +      refspec[refspec_nr-1] = ref;
  }
  
  static void set_refspecs(const char **refs, int nr)
@@@ -130,8 -130,8 +130,8 @@@ static int push_with_options(struct tra
  
        if (nonfastforward && advice_push_nonfastforward) {
                fprintf(stderr, "To prevent you from losing history, non-fast-forward updates were rejected\n"
-                               "Merge the remote changes before pushing again.  See the 'Note about\n"
-                               "fast-forwards' section of 'git push --help' for details.\n");
+                               "Merge the remote changes (e.g. 'git pull') before pushing again.  See the\n"
+                               "'Note about fast-forwards' section of 'git push --help' for details.\n");
        }
  
        return 1;