undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH 1/3] Update mode-change strings in diff output.

Browse Source 
This updates the mode change strings to be a bit more machine
friendly.  Although this might go against the spirit of
readability for human consumption, these mode bits strings are
shown only when unusual things (mode change, file creation and
deletion) happens, output normalized for machine consumption
would be permissible.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
This commit is contained in:
Junio C Hamano 2005-05-13 18:40:14 -07:00 committed by Petr Baudis
parent 2ecd90502f
commit 273b98343c
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
diff.c
View File

@ -83,6 +83,7 @@ static void builtin_diff(const char *name,
struct diff_tempfile *temp)
{
int i, next_at;
const char *git_prefix = "# mode: ";
const char *diff_cmd = "diff -L'%s%s' -L'%s%s'";
const char *diff_arg = "'%s' '%s'||:"; /* "||:" is to return 0 */
const char *input_name_sq[2];
@ -123,17 +124,18 @@ static void builtin_diff(const char *name,
diff_arg, input_name_sq[0], input_name_sq[1]);
if (!path1[0][0])
printf("Created: %s (mode:%s)\n", name, temp[1].mode);
printf("%s. %s %s\n", git_prefix, temp[1].mode, name);
else if (!path1[1][0])
printf("Deleted: %s\n", name);
else if (strcmp(temp[0].mode, temp[1].mode)) {
printf("Mode changed: %s (%s->%s)\n", name,
temp[0].mode, temp[1].mode);
/* Be careful. We do not want to diff between
* symlink and a file.
printf("%s%s . %s\n", git_prefix, temp[0].mode, name);
else {
if (strcmp(temp[0].mode, temp[1].mode))
printf("%s%s %s %s\n", git_prefix,
temp[0].mode, temp[1].mode, name);
if (strncmp(temp[0].mode, temp[1].mode, 3))
/* we do not run diff between different kind
* of objects.
*/
if (strncmp(temp[0].mode, "120", 3) !=
strncmp(temp[1].mode, "120", 3))
exit(0);
}
fflush(NULL);