Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

difftool: silence warning

Silence a warning given when running git difftool --dir-diff and
there are no changes.

This is because command_oneline returns undef when the command has no
output, not ''.

Signed-off-by: Ross Lagerwall <rosslagerwall@gmail.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit ed36e5bd41f7192e42e9b4c573875a343a9daf48 1 parent 755e8b3
Ross Lagerwall rosslagerwall authored committed

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. +1 1  git-difftool.perl
2  git-difftool.perl
@@ -138,7 +138,7 @@ sub setup_dir_diff
138 138
139 139 my @gitargs = ('diff', '--raw', '--no-abbrev', '-z', @ARGV);
140 140 my $diffrtn = $diffrepo->command_oneline(@gitargs);
141   - exit(0) if (length($diffrtn) == 0);
  141 + exit(0) unless defined($diffrtn);
142 142
143 143 # Build index info for left and right sides of the diff
144 144 my $submodule_mode = '160000';

Git Notes

amlog

Message-Id: <1345544500-16277-1-git-send-email-rosslagerwall@gmail.com>

0 comments on commit ed36e5b

Please sign in to comment.
Something went wrong with that request. Please try again.