summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-29 17:14:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-29 17:14:41 -0700
commitac2b0e8fb77d02f480af3f45a44cb9ea611008a4 (patch)
tree0ee737307cb61cc33383246e2f4eae025778f4e4 /builtin
parentgit cherry-pick: do not dereference a potential NULL pointer (diff)
downloadtgif-ac2b0e8fb77d02f480af3f45a44cb9ea611008a4.tar.xz
cherry-pick: regression fix for empty commits
The earlier "--keep-redundant-commit" series broke "cherry-pick" that is given a commit whose change is already in the current history. Such a cherry-pick would result in an empty change, and should stop with an error, telling the user that conflict resolution may have made the result empty (which is exactly what is happening), but we silently dropped the change on the floor without any message nor non-zero exit code. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions