summaryrefslogtreecommitdiff
path: root/worktree.c
Commit message (Expand)AuthorAgeFilesLines
* Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-1/+1
* worktree remove: allow it when $GIT_WORK_TREE is already goneNguyễn Thái Ngọc Duy2018-02-121-1/+8
* worktree.c: add update_worktree_location()Nguyễn Thái Ngọc Duy2018-02-121-0/+17
* worktree.c: add validate_worktree()Nguyễn Thái Ngọc Duy2018-01-241-0/+72
* Merge branch 'bc/object-id'Junio C Hamano2017-11-061-1/+1
|\
| * refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson2017-10-161-1/+1
| * worktree: convert struct worktree to object_idbrian m. carlson2017-10-161-1/+1
* | worktree: handle broken symrefs in find_shared_symref()jk/misc-resolve-ref-unsafe-fixesJeff King2017-10-211-1/+2
|/
* refs: pass NULL to refs_resolve_ref_unsafe() if hash is not neededRené Scharfe2017-09-241-2/+1
* Merge branch 'nd/prune-in-worktree'Junio C Hamano2017-09-191-0/+22
|\
| * revision.c: --all adds HEAD from all worktreesNguyễn Thái Ngọc Duy2017-08-241-0/+22
* | Merge branch 'nd/worktree-kill-parse-ref'Junio C Hamano2017-09-101-1/+1
|\ \ | |/ |/|
| * branch: fix branch renaming not updating HEADs correctlynd/worktree-kill-parse-refNguyễn Thái Ngọc Duy2017-08-241-1/+1
* | path: convert strbuf_git_common_path to take a 'struct repository'Brandon Williams2017-06-231-1/+2
* | Merge branch 'js/plug-leaks'Junio C Hamano2017-05-291-1/+1
|\ \
| * | submodule_uses_worktrees(): plug memory leakJohannes Schindelin2017-05-081-1/+1
* | | Merge branch 'nd/worktree-kill-parse-ref'Junio C Hamano2017-05-161-75/+27
|\ \ \ | |/ / |/| / | |/
| * worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()Nguyễn Thái Ngọc Duy2017-04-241-75/+27
* | prefix_filename: return newly allocated stringJeff King2017-03-211-1/+4
* | prefix_filename: drop length parameterJeff King2017-03-211-1/+1
|/
* Merge branch 'js/realpath-pathdup-fix'Junio C Hamano2017-03-121-1/+1
|\
| * real_pathdup(): fix callsites that wanted it to die on errorjs/realpath-pathdup-fixJohannes Schindelin2017-03-081-1/+1
* | Merge branch 'rs/strbuf-add-real-path'Junio C Hamano2017-03-101-1/+1
|\ \ | |/ |/|
| * cocci: use ALLOC_ARRAYRené Scharfe2017-02-271-1/+1
* | Merge branch 'rs/absolute-pathdup'Junio C Hamano2017-02-021-1/+1
|\ \
| * | use absolute_pathdup()rs/absolute-pathdupRené Scharfe2017-01-271-1/+1
* | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-01-181-1/+1
|\ \ \
| * | | real_path: have callers use real_pathdup and strbuf_realpathBrandon Williams2016-12-121-1/+1
| |/ /
* | | worktree: initialize return value for submodule_uses_worktreesStefan Beller2016-12-271-1/+1
* | | worktree: check if a submodule uses worktreesStefan Beller2016-12-121-0/+50
| |/ |/|
* | worktree list: keep the list sortednd/worktree-list-fixupNguyễn Thái Ngọc Duy2016-11-281-0/+14
* | worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy2016-11-281-2/+2
* | get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy2016-11-281-7/+3
* | worktree.c: zero new 'struct worktree' on allocationNguyễn Thái Ngọc Duy2016-11-231-12/+2
|/
* worktree: allow the main brach of a bare repository to be checked outdk/worktree-dup-checkout-with-bare-is-okDennis Kaarsemaker2016-10-141-0/+2
* Merge branch 'nd/worktree-lock'Junio C Hamano2016-07-281-0/+77
|\
| * worktree.c: find_worktree() search by path suffixNguyễn Thái Ngọc Duy2016-07-081-0/+29
| * worktree.c: add is_worktree_locked()Nguyễn Thái Ngọc Duy2016-06-131-0/+28
| * worktree.c: add is_main_worktree()Nguyễn Thái Ngọc Duy2016-06-031-0/+5
| * worktree.c: add find_worktree()Nguyễn Thái Ngọc Duy2016-06-031-0/+15
* | Merge branch 'rs/worktree-use-strbuf-absolute-path'Junio C Hamano2016-07-251-2/+2
|\ \
| * | worktree: use strbuf_add_absolute_path() directlyrs/worktree-use-strbuf-absolute-pathRené Scharfe2016-07-121-2/+2
* | | Merge branch 'nd/worktree-cleanup-post-head-protection'Junio C Hamano2016-07-061-10/+8
|\ \ \ | |/ / |/| / | |/
| * worktree.c: use is_dot_or_dotdot()Nguyễn Thái Ngọc Duy2016-05-241-1/+1
| * worktree.c: rewrite mark_current_worktree() to avoid strbufNguyễn Thái Ngọc Duy2016-05-241-9/+7
* | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-231-18/+104
|\ \ | |/
| * branch: do not rename a branch under bisect or rebasend/worktree-various-headsNguyễn Thái Ngọc Duy2016-04-221-4/+4
| * worktree.c: check whether branch is bisected in another worktreeNguyễn Thái Ngọc Duy2016-04-221-0/+19
| * worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy2016-04-221-0/+32
| * worktree.c: avoid referencing to worktrees[i] multiple timesNguyễn Thái Ngọc Duy2016-04-221-2/+4