diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:18 -0800 |
| commit | c13c783c9d3d7d3eff937b7bf3642d2a7fe32644 (patch) | |
| tree | c650be76225f1b73aa5df51bcba519c532ebf437 /transport.c | |
| parent | 3f7ebc6ece46f1c23480d094688b8b5f24eb345c (diff) | |
| parent | 39ee4c6c2fc80960094ae1454922c2d10c72f210 (diff) | |
| download | git-c13c783c9d3d7d3eff937b7bf3642d2a7fe32644.tar.gz | |
Merge branch 'km/delete-ref-reflog-message'
"git update-ref -d" and other operations to delete references did
not leave any entry in HEAD's reflog when the reference being
deleted was the current branch. This is not a problem in practice
because you do not want to delete the branch you are currently on,
but caused renaming of the current branch to something else not to
be logged in a useful way.
* km/delete-ref-reflog-message:
branch: record creation of renamed branch in HEAD's log
rename_ref: replace empty message in HEAD's log
update-ref: pass reflog message to delete_ref()
delete_ref: accept a reflog message argument
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 48864b3a9e..5828e06afd 100644 --- a/transport.c +++ b/transport.c @@ -299,7 +299,7 @@ void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int v if (verbose) fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst); if (ref->deletion) { - delete_ref(rs.dst, NULL, 0); + delete_ref(NULL, rs.dst, NULL, 0); } else update_ref("update by push", rs.dst, ref->new_oid.hash, NULL, 0, 0); |