diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2016-04-25 15:56:07 +0200 |
---|---|---|
committer | Michael Haggerty <mhagger@alum.mit.edu> | 2016-06-13 11:23:50 +0200 |
commit | 92b1551b1d407065f961ffd1d972481063a0edcc (patch) | |
tree | b0414772aae6e158900945f1e5374f523aa8f1cc /git-gui/.gitignore | |
parent | ref_transaction_update(): check refname_is_safe() at a minimum (diff) | |
download | tgif-92b1551b1d407065f961ffd1d972481063a0edcc.tar.xz |
refs: resolve symbolic refs first
Before committing ref updates, split symbolic ref updates into two
parts: an update to the underlying ref, and a log-only update to the
symbolic ref. This ensures that both references are locked correctly
during the transaction, including while their reflogs are updated.
Similarly, if the reference pointed to by HEAD is modified directly, add
a separate log-only update to HEAD, rather than leaving the job of
updating HEAD's reflog to commit_ref_update(). This change ensures that
HEAD is locked correctly while its reflog is being modified, as well as
being cheaper (HEAD only needs to be resolved once).
This makes use of a new function, lock_raw_ref(), which is analogous to
read_raw_ref(), but acquires a lock on the reference before reading it.
This change still has two problems:
* There are redundant read_ref_full() reference lookups.
* It is still possible to get incorrect reflogs for symbolic references
if there is a concurrent update by another process, since the old_oid
of a symref is determined before the lock on the pointed-to ref is
held.
Both problems will soon be fixed.
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
WIP
Diffstat (limited to 'git-gui/.gitignore')
0 files changed, 0 insertions, 0 deletions