summaryrefslogtreecommitdiff
path: root/diff-merges.c
diff options
context:
space:
mode:
authorMatheus Tavares <matheus.bernardino@usp.br>2021-04-08 20:41:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-08 21:18:03 (GMT)
commita20f70478ffcc66d30936920ebcc35ebfc12a7c7 (patch)
tree1e5865434bde7d8f5a94bb6f93ba304df307bd4c /diff-merges.c
parentb243012cb39e2151ffae96bded2387751d876d12 (diff)
downloadgit-a20f70478ffcc66d30936920ebcc35ebfc12a7c7.zip
git-a20f70478ffcc66d30936920ebcc35ebfc12a7c7.tar.gz
git-a20f70478ffcc66d30936920ebcc35ebfc12a7c7.tar.bz2
add: warn when asked to update SKIP_WORKTREE entries
`git add` already refrains from updating SKIP_WORKTREE entries, but it silently exits with zero code when it is asked to do so. Instead, let's warn the user and display a hint on how to update these entries. Note that we only warn the user whey they give a pathspec item that matches no eligible path for updating, but it does match one or more SKIP_WORKTREE entries. A warning was chosen over erroring out right away to reproduce the same behavior `add` already exhibits with ignored files. This also allow users to continue their workflow without having to invoke `add` again with only the eligible paths (as those will have already been added). Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.c')
0 files changed, 0 insertions, 0 deletions