diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2013-10-14 20:10:49 +0200 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2013-10-14 20:10:49 +0200 |
| commit | b922e7983b3d275b935bea45757f806223389107 (patch) | |
| tree | 359268a71f0ea8374bda9c1a879979d78d464411 | |
| parent | dfa324280f621a287d146282ad3c32edc30648ff (diff) | |
| download | dotfiles-b922e7983b3d275b935bea45757f806223389107.tar.gz dotfiles-b922e7983b3d275b935bea45757f806223389107.tar.xz dotfiles-b922e7983b3d275b935bea45757f806223389107.zip | |
bash: patch-suggested-changes: the outer diff was reversed
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
| -rw-r--r-- | .bashrc-work | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.bashrc-work b/.bashrc-work index 3fc6b75..ef9a7d8 100644 --- a/.bashrc-work +++ b/.bashrc-work @@ -4,11 +4,11 @@ patch-suggested-change() { [ $# -ne 1 ] && int-usage "rej-file" && return local origfile=${1%.rej} { echo "diff ${origfile}.patch ${origfile}.patch.orig"; colordiff -du \ + <(tail -n+3 "${origfile}.rej") \ <(diff -du \ "${origfile}" \ <(wiggle --merge "${origfile}" "${origfile}.rej") \ - | tail -n+3) \ - <(tail -n+3 "${origfile}.rej") + | tail -n+3) } | sed '2,4d;' | subdiff #} | subdiff | tail -n+5 } |