Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | maint: update all copyright year number ranges | Jim Meyering | 2012-01-01 | 1 | -2/+2 |
| | | | | Run "make update-copyright". | ||||
* | give a diagnostic rather than a failed assertion for a mangled patch | Jim Meyering | 2011-10-11 | 1 | -0/+1 |
| | | | | | | | | | | * src/pch.c (another_hunk): Rather than asserting(C), issue the "replacement text or line numbers mangled ..." diagnostic when !C. * tests/mangled-numbers-abort: New test for the above. * tests/Makefile.am (TESTS): Add it. * NEWS: Mention it. Reported by Gabriel Vlasiu via Tim Waugh. See also http://bugzilla.redhat.com/738959 | ||||
* | maint: update copyright date year ranges to include 2011 | Jim Meyering | 2011-03-27 | 1 | -2/+2 |
| | | | | | * bootstrap.conf (gnulib_modules): Add update-copyright. Run "make update-copyright". | ||||
* | Ignore dangerous filenames instead of failing immediately | Andreas Gruenbacher | 2011-02-16 | 1 | -1/+1 |
| | | | | | | | | | | * src/pch.c (name_is_valid): New function. (intuit_diff_type, best_name): Use name_is_valid() here. (strip_leading_slashes): Remove name validation tests from here. * tests/bad-filenames: Add more tests for covering more of the file name guessing corner cases in intuit_diff_type(), update the existing tests. * NEWS: Update. | ||||
* | doc: mention the fix for CVE-2010-4651 | Jim Meyering | 2011-02-03 | 1 | -0/+2 |
| | | | | * NEWS: Mention the fix. | ||||
* | Only recognize quited filename in the "diff --git" format | Andreas Gruenbacher | 2010-10-05 | 1 | -4/+5 |
| | | | | | | | | * src/util.c: Add a maybe_quoted parameter to fetchname. * src/pch.c: Only recognize quited filename in the "diff --git" format, at least for now. * tests/quoted-filenames: Update accordingly. * NEWS: Update accordingly. | ||||
* | Document that "diff --git" criss-cross renames don't work | Andreas Gruenbacher | 2010-09-17 | 1 | -2/+5 |
| | | | | | | * NEWS: Document that "diff --git" criss-cross renames are broken still. * tests/criss-cross: Test case currently expected to fail. | ||||
* | * NEWS: Update. | Andreas Gruenbacher | 2010-05-02 | 1 | -9/+15 |
| | | | | | * gnulib: Update to latest. * bootstrap: Update from gnulib. | ||||
* | Document the recent changes | Andreas Gruenbacher | 2010-04-23 | 1 | -0/+10 |
| | | | | | | * patch.man: Describe the fixed behavior of --set-time and --set-utc for timestamps that include time zones. * NEWS: Update. | ||||
* | * NEWS: Version 2.6.1 released.v2.6.1 | Andreas Gruenbacher | 2009-12-30 | 1 | -0/+2 |
| | |||||
* | * src/patch.c (longopts, get_some_switches): Add an optional argument | Andreas Gruenbacher | 2009-12-29 | 1 | -0/+5 |
| | | | | | | | | | to the --merge option to choose the output formats for conflicts. * patch.man: Document the new optional argument of --merge. * src/merge.c (merge_hunk): Implement diff3-style conflicts. * src/common.h (conflict_style): This global variable determines the output format for conflicts. * tests/merge: Add test cases for the diff3 output format. | ||||
* | Version 2.6 releasedv2.6 | Andreas Gruenbacher | 2009-11-13 | 1 | -0/+2 |
| | |||||
* | The -m option hasn't been officially allocated yet; use only the long form ↵ | Andreas Gruenbacher | 2009-07-19 | 1 | -1/+1 |
| | | | | for now (--merge) | ||||
* | When the file to patch is specified on the command line, apply all patches ↵ | Andreas Gruenbacher | 2009-05-12 | 1 | -2/+6 |
| | | | | to that file | ||||
* | Change the default value of PATCH_GET to 0 | Vincent Legoll | 2009-05-12 | 1 | -0/+3 |
| | | | | | | | | | | | | | Patch should default to not try to get files from revision control software unless actively asked by the user with the "-g" or "--get" command-line switches, or the PATCH_GET environment variable. Make the posixly correct behaviour of not using source control, the global patch default. I.e. default to "-g0". This is related to debian BTS bug: #200895 Please refer to that discussion for more background information and discussion. | ||||
* | Update NEWS | Andreas Gruenbacher | 2009-04-07 | 1 | -10/+8 |
| | |||||
* | Phrase things a little better | Andreas Gruenbacher | 2009-04-06 | 1 | -2/+2 |
| | |||||
* | Copyright notice updates | Andreas Gruenbacher | 2009-04-05 | 1 | -1/+1 |
| | |||||
* | Revert (almost) to the original asymmetric hunk behavior and document that | Andreas Gruenbacher | 2009-04-05 | 1 | -9/+0 |
| | |||||
* | If an asymmmetric hunk starts at a line > 1, it is not from the start of the ↵ | Andreas Gruenbacher | 2009-04-03 | 1 | -4/+5 |
| | | | | file | ||||
* | Update the NEWS file | Andreas Gruenbacher | 2009-04-03 | 1 | -2/+10 |
| | |||||
* | Prepare for second alpha release | Andreas Gruenbacher | 2009-03-29 | 1 | -8/+18 |
| | | | | | Update NEWS. Packaging and various other minor fixes. | ||||
* | When conforming to POSIX and no filename was given or found, ask | Andreas Gruenbacher | 2009-03-22 | 1 | -1/+2 |
| | |||||
* | More NEWS. | Andreas Gruenbacher | 2009-03-22 | 1 | -7/+10 |
| | |||||
* | Prepare for first alpha release | Andreas Gruenbacher | 2009-03-22 | 1 | -8/+30 |
| | | | | | | Update NEWS. Don't make $(TESTS) a prerequisite of dist: this would run the tests. Add reminder for myself how to upload. | ||||
* | Include patch headers in reject files | Andreas Gruenbacher | 2009-03-22 | 1 | -0/+1 |
| | | | | This turns reject files into properly formatted patches. | ||||
* | Add unified reject format and the --reject-format=FORMAT option | Andreas Gruenbacher | 2009-03-22 | 1 | -0/+8 |
| | |||||
* | Various changes lumped together | Andreas Gruenbacher | 2009-03-21 | 1 | -3/+3 |
| | | | | (Imported from working tree by Andreas Gruenbacher) | ||||
* | Import of patch-2.5.9.tar.gzv2.5.9 | Andreas Gruenbacher | 2009-03-17 | 1 | -3/+3 |
| | |||||
* | Import of patch-2.5.8.tar.gzv2.5.8 | Andreas Gruenbacher | 2009-03-17 | 1 | -0/+2 |
| | |||||
* | Import of patch-2.5.7.tar.gzv2.5.7 | Andreas Gruenbacher | 2009-03-17 | 1 | -5/+42 |
| | |||||
* | Import of patch-2.5.3.tar.gzv2.5.3 | Andreas Gruenbacher | 2009-03-12 | 1 | -0/+25 |
| | |||||
* | Import of patch-2.5.tar.gzv2.5 | Andreas Gruenbacher | 2009-03-12 | 1 | -2/+17 |
| | |||||
* | Import of patch-2.4.tar.gzv2.4 | Andreas Gruenbacher | 2009-03-12 | 1 | -23/+49 |
| | |||||
* | Import of patch-2.3.tar.gzv2.3 | Andreas Gruenbacher | 2009-03-12 | 1 | -0/+51 |
| | |||||
* | Import of patch-2.2.tar.gzv2.2 | Andreas Gruenbacher | 2009-03-12 | 1 | -3/+66 |
| | |||||
* | Import of patch-2.1.tar.gzv2.1 | Andreas Gruenbacher | 2009-03-12 | 1 | -0/+18 |