summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2020-11-10 12:38:27 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-10 13:05:06 -0800
commitc714d0587567d67e1c3702e44221c1b46dc969ff (patch)
tree1d921346269705a17fb023894d5bc8d8dde36e89 /t/t7611-merge-abort.sh
parentblame: validate and peel the object names on the ignore list (diff)
downloadtgif-c714d0587567d67e1c3702e44221c1b46dc969ff.tar.xz
blame: silently ignore invalid ignore file objects
Since 610e2b9240 (blame: validate and peel the object names on the ignore list, 2020-09-24) git blame reports checks if objects specified with --ignore-rev and in files loaded with --ignore-revs-file and config option blame.ignoreRevsFile are actual objects and dies if they aren't. The intent is to report typos to the user. This also breaks the ability to use a single ignore file for multiple repositories. Typos are presumably less likely in files than on the command line, so alerting is less useful here. Restore that feature by skipping non-commits without dying. Reported-by: Jean-Yves Avenard <jyavenard@mozilla.com> Signed-off-by: René Scharfe <l.s.r@web.de> Reviewed-by: Barret Rhoden <brho@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7611-merge-abort.sh')
0 files changed, 0 insertions, 0 deletions