Merge branch 'ow/no-dryrun-in-add-i'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 May 2021 23:26:09 +0000 (08:26 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 May 2021 23:26:09 +0000 (08:26 +0900)
commit47fa10661746e32cbc76a88392e1cda38def27c6
treea2b2cd225f4b9ed50b667803ba66ff79ce740503
parente289f681ede1aad2ded33e76518bdc80064f3c16
parenta1989cf7b8d062960b6f8de00435711c45b95285
Merge branch 'ow/no-dryrun-in-add-i'

"git add -i --dry-run" does not dry-run, which was surprising.  The
combination of options has taught to error out.

* ow/no-dryrun-in-add-i:
  add: die if both --dry-run and --interactive are given
builtin/add.c
t/t3700-add.sh