Skip to main content

Browse the archive

Revision 91dcdfd3b5331d955cfb60edf8930f1b5c142905 authored by Linus Torvalds on 12 July 2005, 03:44:20 UTC, committed by Linus Torvalds on 12 July 2005, 03:44:20 UTC 
Make "git checkout" create new branches on demand
 
In particular, if we check out something that isn't an old branch, it
now requires a new branch-name to check the thing out into.

So, for example:

	git checkout -b my-branch v2.6.12

will create the new branch "my-branch", and start it at v2.6.12, while

	git checkout master

will just switch back to the master branch.

Of course, if you want to create a new branch "my-branch" and _not_
check it out, you could have done so with just

	git-rev-parse v2.6.12^0 > .git/refs/heads/my-branch

which I think I will codify as "git branch".
1 parent 714fff2
Raw File
patch-delta.c 
/*
 * patch-delta.c:
 * recreate a buffer from a source and the delta produced by diff-delta.c
 *
 * (C) 2005 Nicolas Pitre <nico@cam.org>
 *
 * This code is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 */

#include <stdlib.h>
#include <string.h>
#include "delta.h"

void *patch_delta(void *src_buf, unsigned long src_size,
		  void *delta_buf, unsigned long delta_size,
		  unsigned long *dst_size)
{
	const unsigned char *data, *top;
	unsigned char *dst_buf, *out, cmd;
	unsigned long size;

	if (delta_size < DELTA_SIZE_MIN)
		return NULL;

	data = delta_buf;
	top = delta_buf + delta_size;

	/* make sure the orig file size matches what we expect */
	size = get_delta_hdr_size(&data);
	if (size != src_size)
		return NULL;

	/* now the result size */
	size = get_delta_hdr_size(&data);
	dst_buf = malloc(size);
	if (!dst_buf)
		return NULL;

	out = dst_buf;
	while (data < top) {
		cmd = *data++;
		if (cmd & 0x80) {
			unsigned long cp_off = 0, cp_size = 0;
			const unsigned char *buf;
			if (cmd & 0x01) cp_off = *data++;
			if (cmd & 0x02) cp_off |= (*data++ << 8);
			if (cmd & 0x04) cp_off |= (*data++ << 16);
			if (cmd & 0x08) cp_off |= (*data++ << 24);
			if (cmd & 0x10) cp_size = *data++;
			if (cmd & 0x20) cp_size |= (*data++ << 8);
			if (cp_size == 0) cp_size = 0x10000;
			buf = (cmd & 0x40) ? dst_buf : src_buf;
			memcpy(out, buf + cp_off, cp_size);
			out += cp_size;
		} else {
			memcpy(out, data, cmd);
			out += cmd;
			data += cmd;
		}
	}

	/* sanity check */
	if (data != top || out - dst_buf != size) {
		free(dst_buf);
		return NULL;
	}

	*dst_size = size;
	return dst_buf;
}
back to top