kernel/git - git - PowerEL Git System

Tree: f8348be3be

Author	SHA1	Message	Date
Linus Torvalds	19c58fb84d	git-apply: parse the whole list of patches into memory first Make it a clear two-phase thing: first a read-only parse of the patch itself (which is independent of any current index information), and then the second phase actually uses the patch. The second phase might not be a real apply, it could be just a diffstat, for example. Which is trivial to do once the patch is parsed.	20 years ago
Junio C Hamano	bba0f401ee	[PATCH] Squelch compiler warning Not important but I am a bit annoyed by gcc complaining about the control falling out of the function without returning value. Signed-off-by: Linus Torvalds <torvalds@osdl.org>	20 years ago
Linus Torvalds	1e3f6b6e64	git-apply: more consistency checks on gitdiff filenames There's some duplication of filenames when doing filename operations (creates, deletes, renames and copies), and this makes us verify that the pathnames match when they should.	20 years ago
Linus Torvalds	9a4a100eb4	git-apply: start using the index file information. Right now we only use it to figure out what the filename might be when that is ambiguous, but we'll get there..	20 years ago
Linus Torvalds	4dfdbe10dc	git-apply: if no input files specified, apply stdin This makes it act more like a traditional UNIX thing (eg "cat").	20 years ago
Linus Torvalds	881b07654c	git-apply: unknown modes are zero, not -1	20 years ago
Linus Torvalds	a4acb0eb14	git-apply: parse the diff headers (both traditional and new) .. and print out the information. This sets up all the pathname information, and whether it's a new file, deleted file, rename, copy or whatever. It's slowly getting to the point where it all comes together, and we can actually apply all the information that we've gathered.	20 years ago
Linus Torvalds	46979f567b	git-apply: improve error detection and messages In particular, give line numbers when detecting corrupt patches. This makes the tool a lot more friendly (indeed, much more so than regular "patch", I think).	20 years ago
Linus Torvalds	5e224a2ed0	git-apply: bad patch fragments are fatal Don't just stop at them and look for the next header. Die, die, die!	20 years ago
Linus Torvalds	c1bb935020	Start implementing "git-apply" This applies git patches (and old-style unified diffs) in the index, rather than doing it in the working directory. That allows for a lot more flexibility, and means that if a patch fails, we aren't going to mess up the working directory. NOTE! This is just the first cut at it, and right now it only parses the incoming patch, it doesn't actually apply it yet.	20 years ago

1 2