kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
David Turner	b02e8595e2	notes: handle multiple worktrees Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using find_shared_symref and die if we find one. This prevents simultaneous merges to the same notes branch from different worktrees. Signed-off-by: David Turner <dturner@twopensource.com> Reviewed-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2015-08-11 13:52:27 -07:00

Author

SHA1

Message

Date

David Turner

b02e8595e2

notes: handle multiple worktrees

Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using
find_shared_symref and die if we find one.  This prevents simultaneous
merges to the same notes branch from different worktrees.

Signed-off-by: David Turner <dturner@twopensource.com>
Reviewed-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2015-08-11 13:52:27 -07:00

1 Commits (48860819e80260abae480407d0bd75dd58e70bb7)