summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-17 10:11:05 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-17 10:11:05 -0800
commit3d1f148c3381de410a9b02a05bde05cd0fb17a0c (patch)
treec853d1e06f704cdc1343322f1684095f9b073312 /compat
parentUpdate draft release notes to 1.7.9.2 (diff)
downloadtgif-3d1f148c3381de410a9b02a05bde05cd0fb17a0c.tar.xz
refresh_index: do not show unmerged path that is outside pathspec
When running "git add --refresh <pathspec>", we incorrectly showed the path that is unmerged even if it is outside the specified pathspec, even though we did honor pathspec and refreshed only the paths that matched. Note that this cange does not affect "git update-index --refresh"; for hysterical raisins, it does not take a pathspec (it takes real paths) and more importantly itss command line options are parsed and executed one by one as they are encountered, so "git update-index --refresh foo" means "first refresh the index, and then update the entry 'foo' by hashing the contents in file 'foo'", not "refresh only entry 'foo'". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions