diff options
| author | David Turner <dturner@twopensource.com> | 2015-08-10 13:52:45 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-11 13:52:27 -0700 |
| commit | b02e8595e263e284e45a6262b92ef158b6966478 (patch) | |
| tree | 30d98251f8d600a3ba97031a9a3c5fe699010bd6 /branch.c | |
| parent | 41af65651d4333cd19ab4af3509fa2d08f3816ed (diff) | |
| download | git-b02e8595e263e284e45a6262b92ef158b6966478.tar.gz git-b02e8595e263e284e45a6262b92ef158b6966478.tar.xz | |
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>
Diffstat (limited to 'branch.c')
0 files changed, 0 insertions, 0 deletions