]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/checkout-index-temp'
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 19:38:23 +0000 (11:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 19:38:28 +0000 (11:38 -0800)
"git checkout-index --temp=$target $path" did not work correctly
for paths outside the current subdirectory in the project.

* es/checkout-index-temp:
  checkout-index: fix --temp relative path mangling
  t2004: demonstrate broken relative path printing
  t2004: standardize file naming in symlink test
  t2004: drop unnecessary write-tree/read-tree
  t2004: modernize style

1  2 
builtin/checkout-index.c

Simple merge