Revision 4fc970c43884e6215c13d6944a2def1eb2134ed5 authored by Junio C Hamano on 26 February 2007, 06:24:47 UTC, committed by Junio C Hamano on 26 February 2007, 06:25:30 UTC
"git-diff-files --cc" to show conflicts during merge did not pass the correct mode information for the working tree down, and showed bogus combined diff. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 0b1f647
update-server-info.c
#include "cache.h"
static const char update_server_info_usage[] =
"git-update-server-info [--force]";
int main(int ac, char **av)
{
int i;
int force = 0;
for (i = 1; i < ac; i++) {
if (av[i][0] == '-') {
if (!strcmp("--force", av[i]) ||
!strcmp("-f", av[i]))
force = 1;
else
usage(update_server_info_usage);
}
}
if (i != ac)
usage(update_server_info_usage);
setup_git_directory();
return !!update_server_info(force);
}
Computing file changes ...