summaryrefslogtreecommitdiff
path: root/t/t5572-pull-submodule.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-25 16:11:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-25 22:39:07 -0700
commitc9e1f2c7f2acca17c629255b96761a4a1047a28a (patch)
tree85cab696b972327a190eb844c36469e778ec7cc1 /t/t5572-pull-submodule.sh
parentMerge branch 'maint-1.9' into maint-2.0 (diff)
downloadtgif-c9e1f2c7f2acca17c629255b96761a4a1047a28a.tar.xz
diff-no-index: DWIM "diff D F" into "diff D/F F"
"git diff --no-index" was supposed to be a poor-man's approach to allow using Git diff goodies outside of a Git repository, without having to patch mainstream diff implementations. Unlike a POSIX diff that treats "diff D F" (or "diff F D") as a request to compare D/F and F (or F and D/F) when D is a directory and F is a file, however, we did not accept such a command line and instead barfed with "file/directory conflict". Imitate what POSIX diff does and append the basename of the file after the name of the directory before comparing. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5572-pull-submodule.sh')
0 files changed, 0 insertions, 0 deletions