diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2009-11-25 08:50:25 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2009-11-25 14:23:36 +0100 |
| commit | 8ffdfe56c1b3c8334601fd1bddcc3a284c53845e (patch) | |
| tree | f17d37f528d08e188384c590709d1d16586d842a | |
| parent | 714b8e6fa1f52229637e75cac96474e0ba84b87d (diff) | |
| download | quilt-8ffdfe56c1b3c8334601fd1bddcc3a284c53845e.tar.gz | |
push: update color matcher for failed merge
Patch(1) has recently changed the message for a failed merge from 'UNMERGED'
to 'NOT MERGED' (See commit 87f54e80 in the patch repository). Adopt this
change to quilt push's color matcher.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/push.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes index 16fa888..580c955 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 25 14:21:44 CET 2009 - bert.wesarg@googlemail.com + +- push: update color matcher for failed merge + +------------------------------------------------------------------- Sun Nov 22 21:32:39 CET 2009 - agruen@suse.de - No longer create backup files of new files with file mode 0. diff --git a/quilt/push.in b/quilt/push.in index c953e01..cca0681 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -72,7 +72,7 @@ colorize() { if [ -n "$opt_color" ]; then awk ' - { if (/FAILED|hunks? ignored|can'\''t find file|file .* already exists|UNMERGED/) + { if (/FAILED|hunks? ignored|can'\''t find file|file .* already exists|NOT MERGED/) print "'$color_patch_fail'" $0 "'$color_clear'" else if (/already applied$/) print "'$color_patch_fuzz'" $0 "'$color_clear'" |