| commit | 1bc992acacf5961e65d9fdddeb8561284e708c74 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 18 Apr 2005 17:42:48 +0000 (18 10:42 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 18 Apr 2005 17:42:48 +0000 (18 10:42 -0700) | ||
| tree | 4dca8f7c63099bfb713f915c110f1fd2ae634337 | treesnapshot (tar.gz zip) |
| parent | 6ad6d3d36c5924c8ff502ebbb6a6216df01e7efb | commitdiff |
[PATCH] Fix confusing behaviour of update-cache --refresh on unmerged paths.
The "update-cache --refresh" command attempts refresh_entry()
on unmerged path, which results in as many "needs update" messages
as there are unmerged stages for that path. This does not do
any harm to the working directory, but it is confusing.
Here is a fix.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
The "update-cache --refresh" command attempts refresh_entry()
on unmerged path, which results in as many "needs update" messages
as there are unmerged stages for that path. This does not do
any harm to the working directory, but it is confusing.
Here is a fix.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| update-cache.c | diffblobblamehistory |