Staging
v0.5.1
https://github.com/git/git
Revision abc02670169cee9541793a86324a014272ca8ed5 authored by Junio C Hamano on 28 June 2006, 18:47:28 UTC, committed by Junio C Hamano on 29 June 2006, 02:30:51 UTC
When we updated "read-tree -m -u" to be careful about not
removing untracked working tree files, we broke "checkout -m" to
switch between branches.

Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 8f4a9b6
Raw File
Tip revision: abc02670169cee9541793a86324a014272ca8ed5 authored by Junio C Hamano on 28 June 2006, 18:47:28 UTC
checkout -m: fix read-tree invocation
Tip revision: abc0267
builtin-stripspace.c
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "builtin.h"

/*
 * Remove empty lines from the beginning and end.
 *
 * Turn multiple consecutive empty lines into just one
 * empty line.  Return true if it is an incomplete line.
 */
static int cleanup(char *line)
{
	int len = strlen(line);

	if (len && line[len-1] == '\n') {
		if (len == 1)
			return 0;
		do {
			unsigned char c = line[len-2];
			if (!isspace(c))
				break;
			line[len-2] = '\n';
			len--;
			line[len] = 0;
		} while (len > 1);
		return 0;
	}
	return 1;
}

void stripspace(FILE *in, FILE *out)
{
	int empties = -1;
	int incomplete = 0;
	char line[1024];

	while (fgets(line, sizeof(line), in)) {
		incomplete = cleanup(line);

		/* Not just an empty line? */
		if (line[0] != '\n') {
			if (empties > 0)
				fputc('\n', out);
			empties = 0;
			fputs(line, out);
			continue;
		}
		if (empties < 0)
			continue;
		empties++;
	}
	if (incomplete)
		fputc('\n', out);
}

int cmd_stripspace(int argc, const char **argv, char **envp)
{
	stripspace(stdin, stdout);
	return 0;
}
back to top