Staging
v0.5.2
https://github.com/git/git
Revision 2eb53e65bd9cdd3b76a6447a1a51dee6e5de96a3 authored by J. Bruce Fields on 22 October 2006, 23:01:23 UTC, committed by Junio C Hamano on 22 October 2006, 23:39:58 UTC
Both the git-prune manpage and everday.txt say that git-prune should also prune
unpacked objects that are also found in packs, by running git prune-packed.

Junio thought this was "a regression when prune was rewritten as a built-in."

So modify prune to call prune-packed again.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
1 parent 474a90f
Raw File
Tip revision: 2eb53e65bd9cdd3b76a6447a1a51dee6e5de96a3 authored by J. Bruce Fields on 22 October 2006, 23:01:23 UTC
Make prune also run prune-packed
Tip revision: 2eb53e6
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, const char *prefix)
{
	stripspace(stdin, stdout);
	return 0;
}
back to top