path: root/apply.c
AgeCommit message (Collapse)Author
2005-10-07git-apply: parse index informationJunio C Hamano
Add an new option --show-index-info to git-apply command to summarize the index information new git-diff outputs. The command shows something similar to git-ls-files --stage output for the pre-change image: 100644 7be5041... apply.c 100644 ec2a161... cache.h ... Signed-off-by: Junio C Hamano <>
2005-10-05git-apply: retire unused/unimplemented --no-merge flag.Junio C Hamano
The original plan was to do 3-way merge between local working tree, index and the patch being applied, but that was never implemented. Retire the flag to control its behaviour. Signed-off-by: Junio C Hamano <>
2005-10-05git-apply: allow operating in sparsely populated working tree.Junio C Hamano
This patch teaches 'git-apply --index' to automatically check out a file being patched. This happens only when the working tree does not have it checked out. Signed-off-by: Junio C Hamano <>
2005-10-01[PATCH] Flag empty patches as errorsLinus Torvalds
A patch that contains no actual diff, and that doesn't change any meta-data is bad. It shouldn't be a patch at all, and git-apply shouldn't just accept it. This caused a corrupted patch to be silently applied as an empty change in the kernel, because the corruption ended up making the patch look empty. An example of such a patch is one that contains the patch header, but where the initial fragment header (the "@@ -nr,.." line) is missing, causing us to not parse any fragments. The real "patch" program will also flag such patches as bad, with the message patch: **** Only garbage was found in the patch input. and we should do likewise. Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
2005-09-04[PATCH] Make git-apply understand incomplete lines in non-C localesFredrik Kuivinen
The message "\ No newline at end of file" used by diff(1) to mark an incomplete line is locale dependent. We can't assume more than that it begins with "\ ". For example, given two files, "foo" and "bar", with appropriate contents, 'diff -u foo bar' will produce the following output on my system: --- foo 2005-09-04 18:59:38.000000000 +0200 +++ bar 2005-09-04 18:59:16.000000000 +0200 @@ -1 +1 @@ -foobar +foo \ Ingen nyrad vid filslut [jc: the check for the marker still uses the line length being no less than 12 bytes for a sanity check, but I think it is safe to assume that in other locales. I haven't checked the .po files from diff, tho'.] Signed-off-by: Fredrik Kuivinen <> Signed-off-by: Junio C Hamano <>
2005-08-29Merge refs/heads/portable from Junio C Hamano
2005-08-28[PATCH] Fix git patch header processing in git-apply.Robert Fitzsimons
Stop processing and return NULL if we encounter a '\n' character before we have two matching names in the git header. Signed-off-by: Robert Fitzsimons <> Signed-off-by: Junio C Hamano <>
2005-08-24Fix ?: statements.Jason Riedy
Omitting the first branch in ?: is a GNU extension. Cute, but not supported by other compilers. Replaced mostly by explicit tests. Calls to getenv() simply are repeated on non-GNU compilers. Signed-off-by: Jason Riedy <>
2005-08-17[PATCH] When copying or renaming, keep the mode, pleaseJohannes Schindelin
Without this patch, git-apply does not retain the mode when renaming or copying files. [jc: Good catch, Johannes. I added a test case to demonstrate the breackage in the original.] Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-08-10[PATCH] -Werror fixesTimo Sirainen
GCC's format __attribute__ is good for checking errors, especially with -Wformat=2 parameter. This fixes most of the reported problems against 2005-08-09 snapshot.
2005-07-29[PATCH] Make git-apply --stat less butt-ugly with long filenamesLinus Torvalds
When git-apply was printing out long filenames, it used to just truncate them to show the last "max_len" characters of the filename. Which can be really quite ugly (note the two filenames that have just been silently truncated from the beginning - it looks even worse when there are lots of them, like there were in the current v2.6.13-rc4 cris arch update): Documentation/video4linux/README.saa7134 | 9 Documentation/video4linux/bttv/Cards | 74 umentation/video4linux/hauppauge-wintv-cx88-ir.txt | 54 Documentation/video4linux/lifeview.txt | 42 mentation/video4linux/not-in-cx2388x-datasheet.txt | 41 Documentation/w1/w1.generic | 107 With this patch it now looks like so: Documentation/video4linux/README.saa7134 | 9 Documentation/video4linux/bttv/Cards | 74 .../video4linux/hauppauge-wintv-cx88-ir.txt | 54 Documentation/video4linux/lifeview.txt | 42 .../video4linux/not-in-cx2388x-datasheet.txt | 41 Documentation/w1/w1.generic | 107 ie we've made it clear with an ellipsis that we've cut off something from the beginning, and it also tries to do it cleanly at a subdirectory level. Signed-off-by: Linus "good taste" Torvalds <> Signed-off-by: Junio C Hamano <>
2005-07-22[PATCH] apply.c: --exclude=fnmatch-pattern option.Junio C Hamano
Adds --exclude=pattern option to the "git-apply" command. This was useful while reimporting the BKCVS patchset dump of the Linux kernel, starting at 2.4.0 and ending at 2.6.12-rc2 Ingo announced some time ago to exclude BitKeeper directory. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-07-22[PATCH] apply.c: handle incomplete lines correctly.Junio C Hamano
The parsing code had a bug that failed to recognize an incomplete line at the end of a fragment, and the fragment application code had a comparison bug to recognize such. Fix them to handle incomplete lines correctly. Add a test script for patches with various combinations of complete and incomplete lines to make sure the fix works. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-07-14[PATCH] apply: match documentation, usage string and code.Junio C Hamano
The more recent --apply option was not described. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-07-14git-apply: be a lot more careful when writing filesLinus Torvalds
We write them under another name and rename them to their destination, so that if something bad happens in the middle, we won't have caused any bigger harm. Also, this makes the writing be NFS "intr" safe, and as a side effects makes sure that if the target is hardlinked (or symlinked) we will have broken the link.
2005-07-12[PATCH] git: fix trivial warning from show_rename_copy()Tony Luck
apply.c: In function `show_rename_copy': apply.c:1147: warning: field precision is not type int (arg 3) Signed-off-by: Tony Luck <> Signed-off-by: Linus Torvalds <>
2005-07-06[PATCH] Let umask do its work upon filesystem object creation.Junio C Hamano
IIRC our strategy was to let the users' umask take care of the final mode bits. This patch fixes places that deviate from it. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-07-03Fix sparse warnings.Linus Torvalds
Mainly making a lot of local functions and variables be marked "static", but there was a "zero as NULL" warning in there too.
2005-06-23git-apply: take "--apply" flag to force an apply even if we also ask for a ↵Linus Torvalds
diffstat Also, remove debugging statement about applying a fragment at an offset.
2005-06-22[PATCH] git-apply: implement --summary option.Junio C Hamano
Typical expected usage is "git-apply --stat --summary" to show diffstat plus dense description of information available in git extended headers, such as creations, renames, and mode changes. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-06-22[PATCH] git-apply --stat: show new filename for rename/copy patch.Junio C Hamano
When a patch is a git extended rename/copy patch, "git-apply --stat" showed the old filename. Change it to show the new filename, because most of the time we are interested in looking at the resulting tree. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-06-22git-apply: create subdirectories leading up to a new fileLinus Torvalds
Applying Andrew's latest patch-bomb showed us failing miserably if a new subdirectory needed to be created.. That said, it's uncommon enough that it's worth optimistically assuming it won't be needed, and then creating the subdirectories only on failure.
2005-06-21[PATCH] git-apply: Don't barf when --stat'ing a diff with no line changes.Sven Verdoolaege
Diffs with only mode changes didn't pass through git-apply --stat. [ Linus' note: they did for me, on my ppc64, where division by zero just silently returns zero. Duh. ] Signed-off-by: Linus Torvalds <>
2005-06-17git-apply: use default name for mode change patchesLinus Torvalds
Pure mode changes won't have the file-name in the extended header lines, so make sure we pick it up from the default name from the "diff --git" line.
2005-06-14git-apply: normalize file mode when comparing with expected valueLinus Torvalds
Sine git only saves the 'x' bit, we shouldn't compare the stat contents directly.
2005-06-13git-apply: fix error handling for nonexistent filesLinus Torvalds
Missing argument for error() function. We should really use the gcc printf format checking capabilities.
2005-06-12git-apply: ignore empty git headersLinus Torvalds
A meaningful (ie non-empty) git patch always has more information in the header than just the "diff --git" line itself: it needs to have either a patch associated with it (which implies "---" and "+++" lines in the header) or it needs to have rename/copy/delete/create information in it. Just ignore git patches which have no change information. Otherwise we'll end up with a patch that doesn't have filenames etc filled in, and we'll be unhappy.
2005-06-08git-apply: creatign empty files is nonfatalLinus Torvalds
(but it will result in a warning)
2005-06-05diff 'rename' format change.Linus Torvalds
Clearly even Junio felt git "rename" header lines should say "from/to" instead of "old/new", since he wrote the documentation that way. This way it also matches "copy". git-apply will accept both versions, at least for a while.
2005-06-05git-apply: consider it an error to apply no changesLinus Torvalds
A "--stat" or a "--check" will just be quiet, but if you try to apply something with no changes, that's an error.
2005-06-05git-apply: fix rename header parsingLinus Torvalds
It's not "rename from" and "rename to", it's "rename old" and "rename new". Which is illogical and doesn't match the "copy from/to" case, but that's life. Maybe Junio will fix it up one of these days.
2005-06-05git-apply: actually apply patches and update the indexLinus Torvalds
We update the index only if the "--index" flag is given, so you can actually use this as a strange kind of "patch" program even for non-git usage. Not that you'd likely want to, but it comes in handy for testing. This _should_ more or less get everythign right, but as usual I leave the testing to the usrs..
2005-06-05git-apply: fix apply of a new fileLinus Torvalds
(And fix name handling for when we have an implied create or delete event from a traditional diff).
2005-06-05git-apply: find offset fragments, and really apply themLinus Torvalds
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.
2005-06-05git-apply: first cut at actually checking fragment dataLinus Torvalds
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.
2005-06-01git-apply --stat: limit lines to 79 charactersLinus Torvalds
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.
2005-05-31git-apply: don't try to be clever about filenames and the indexLinus Torvalds
It just causes things like "git-apply --stat" to parse traditional patch headers differently depending on what your index is, which is nasty.
2005-05-31[PATCH] Show dissimilarity index for D and N case.Junio C Hamano
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 <>
2005-05-26git-apply: add "--check" option to check that the diff makes senseLinus Torvalds
It currently only verifies the index against the working directory, it doesn't actually verify the diff fragments themselves yet.
2005-05-26git-apply: when validating default names, check the final EOLN tooLinus Torvalds
This means that filenames are totally unambiguous even if they have spaces or tabs in them.
2005-05-26git-apply: pick up default filenames from "diff --git" header lineLinus Torvalds
Pure mode changes, and deletes or creates of empty files won't have this information anywhere else.
2005-05-26git-apply: make the diffstat output happen for "--stat" only.Linus Torvalds
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.
2005-05-26git-apply: implement "diffstat" outputLinus Torvalds
Hey, it's almost free by now, and it's a good way to see that we parse the patches correctly.
2005-05-26git-apply: parse the whole list of patches into memory firstLinus Torvalds
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.
2005-05-25[PATCH] Squelch compiler warningJunio C Hamano
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 <>
2005-05-24git-apply: more consistency checks on gitdiff filenamesLinus Torvalds
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.
2005-05-24git-apply: start using the index file information.Linus Torvalds
Right now we only use it to figure out what the filename might be when that is ambiguous, but we'll get there..
2005-05-23git-apply: if no input files specified, apply stdinLinus Torvalds
This makes it act more like a traditional UNIX thing (eg "cat").
2005-05-23git-apply: unknown modes are zero, not -1Linus Torvalds
2005-05-23git-apply: parse the diff headers (both traditional and new)Linus Torvalds
.. 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.