Skip to content

Show binary diff if exif has no diff #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavidDTA wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Show binary diff if exif has no diff #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions diff-image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ exif()

diff_clean_names()
{
diff -u "$1" --label "$name1" "$2" --label "$name2" || true
diff -u "$1" --label "$name1" "$2" --label "$name2"
}


Expand All @@ -143,13 +143,13 @@ if which exiftool > /dev/null
then
d1="$(exif "$f1")"
d2="$(exif "$f2")"
diff_clean_names "$d1" "$d2"
diff_clean_names "$d1" "$d2" && diff_clean_names "$f1" "$f2" || true
set +e
diff -q "$d1" "$d2" >/dev/null
exifdiff=$?
set -e
else
diff_clean_names "$f1" "$f2"
diff_clean_names "$f1" "$f2" || true
fi

if $exif_only
Expand Down