kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Linus Torvalds	30996652e7	git-apply: fix apply of a new file (And fix name handling for when we have an implied create or delete event from a traditional diff).	20 years ago
Linus Torvalds	6e7c92a91d	git-apply: find offset fragments, and really apply them This applies the fragments in memory, but doesn't actually write the results out to the files yet. But we now do all the difficult parts, the rest is just basically writing the results out and updating the index.	20 years ago
Linus Torvalds	3cca928d4a	git-apply: first cut at actually checking fragment data Right now it requires that the fragment offsets be exact, and it doesn't actually apply the fragment yet, but it does find where it goes and verify the data. Next step: actually applying the fragment changes.	20 years ago
Linus Torvalds	95bedc9eec	git-apply --stat: limit lines to 79 characters It had already tried to do that, but with the independent rounding of the number of '+' and '-' characters, it would sometimes do 80-char lines after all.	20 years ago
Linus Torvalds	381ca9a3bc	git-apply: don't try to be clever about filenames and the index It just causes things like "git-apply --stat" to parse traditional patch headers differently depending on what your index is, which is nasty.	20 years ago
Junio C Hamano	70aadac081	[PATCH] Show dissimilarity index for D and N case. The way broken deletes and creates are shown in the -p (diff-patch) output format has become consistent with how rename/copy edits are shown. They will show "dissimilarity index" value, immediately following the "deleted file mode" and "new file mode" lines. The git-apply is taught to grok such an extended header. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Linus Torvalds	a577284aee	git-apply: add "--check" option to check that the diff makes sense It currently only verifies the index against the working directory, it doesn't actually verify the diff fragments themselves yet.	20 years ago
Linus Torvalds	0e87e048e1	git-apply: when validating default names, check the final EOLN too This means that filenames are totally unambiguous even if they have spaces or tabs in them.	20 years ago
Linus Torvalds	5041aa7040	git-apply: pick up default filenames from "diff --git" header line Pure mode changes, and deletes or creates of empty files won't have this information anywhere else.	20 years ago
Linus Torvalds	fab2c257be	git-apply: make the diffstat output happen for "--stat" only. Slowly this is takign the form of a program that we'd actually use. Now "git-apply --stat" basically ends up being a perfectly useful diffstat.	20 years ago
Linus Torvalds	3f40315aaa	git-apply: implement "diffstat" output Hey, it's almost free by now, and it's a good way to see that we parse the patches correctly.	20 years ago
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 3

113 Commits (1a5fccc0c26b4a8abafd85a73558022e65f6f8cf)