]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 41af656) | patch
notes: handle multiple worktrees
authorDavid Turner <dturner@twopensource.com>
Mon, 10 Aug 2015 17:52:45 +0000 (13:52 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Aug 2015 20:52:27 +0000 (13:52 -0700)
commitb02e8595e263e284e45a6262b92ef158b6966478
tree30d98251f8d600a3ba97031a9a3c5fe699010bd6tree | snapshot
parent41af65651d4333cd19ab4af3509fa2d08f3816edcommit | diff
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>
builtin/notes.c diff | blob | blame | history
t/t3320-notes-merge-worktrees.sh [new file with mode: 0755] blob
Unnamed repository; edit this file 'description' to name the repository.