diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-12 18:07:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-12 18:07:09 -0700 |
| commit | 642f7108f68ef622b338d27d94a956e32c8567dd (patch) | |
| tree | 32972655c14bdbd803e3842cb2220b9045632199 /builtin | |
| parent | 7980e41746bc5de91eea775f9142ce44b1100361 (diff) | |
| parent | 452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e (diff) | |
| download | git-642f7108f68ef622b338d27d94a956e32c8567dd.tar.gz git-642f7108f68ef622b338d27d94a956e32c8567dd.tar.xz | |
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.
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/index-pack.c | 2 | ||||
| -rw-r--r-- | builtin/push.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index a89ae831d..fad76bf7a 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -884,6 +884,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) if (argc == 2 && !strcmp(argv[1], "-h")) usage(index_pack_usage); + read_replace_refs = 0; + /* * We wish to read the repository's config file if any, and * for that it is necessary to call setup_git_directory_gently(). diff --git a/builtin/push.c b/builtin/push.c index a2cc9fdea..e655eb769 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -130,8 +130,8 @@ static int push_with_options(struct transport *transport, int flags) 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; |