diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-09 00:19:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-09 00:19:50 -0700 |
| commit | bb293b831b9d0aade79c0acf5bf6091106e7d19b (patch) | |
| tree | 6549f6423c83a66b04bf51daedcb5fa592170c27 /builtin-send-pack.c | |
| parent | fd11ae0b52b6d059056a32851a916c152befae1a (diff) | |
| parent | e09c4e753c337d914f4eb7a05cb5e8bbfc362489 (diff) | |
| download | git-bb293b831b9d0aade79c0acf5bf6091106e7d19b.tar.gz | |
Merge branch 'maint'
* maint:
Start preparing release notes for 1.5.6.3
git-submodule - Fix bugs in adding an existing repo as a module
bash: offer only paths after '--'
Remove unnecessary pack-*.keep file after successful git-clone
make deleting a missing ref more quiet
Diffstat (limited to 'builtin-send-pack.c')
| -rw-r--r-- | builtin-send-pack.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-send-pack.c b/builtin-send-pack.c index d76260c09e..a708d0af48 100644 --- a/builtin-send-pack.c +++ b/builtin-send-pack.c @@ -226,8 +226,7 @@ static void update_tracking_ref(struct remote *remote, struct ref *ref) if (args.verbose) fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst); if (ref->deletion) { - if (delete_ref(rs.dst, NULL)) - error("Failed to delete"); + delete_ref(rs.dst, NULL); } else update_ref("update by push", rs.dst, ref->new_sha1, NULL, 0, 0); |