diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 20:15:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 20:15:22 -0700 |
| commit | fc4263ce4b6a613622dbe985a8e6aca015789cf1 (patch) | |
| tree | c37d083322ab4a63d5012ba89a9730f750e02cff /diff-stages.c | |
| parent | 5e749e259b39a74b31f6c768588b4e628e3802cb (diff) | |
| download | git-fc4263ce4b6a613622dbe985a8e6aca015789cf1.tar.gz | |
Avoid gcc warning in diff-stages.c
Put explicit parentheses around && in ||-expression.
Diffstat (limited to 'diff-stages.c')
| -rw-r--r-- | diff-stages.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-stages.c b/diff-stages.c index f0998149cf..9d8cc73e67 100644 --- a/diff-stages.c +++ b/diff-stages.c @@ -107,7 +107,7 @@ int main(int ac, const char **av) ! (0 <= stage1 && stage1 <= 3) || sscanf(av[2], "%d", &stage2) != 1 || ! (0 <= stage2 && stage2 <= 3) || - find_copies_harder && detect_rename != DIFF_DETECT_COPY) + (find_copies_harder && detect_rename != DIFF_DETECT_COPY)) usage(diff_stages_usage); av += 3; /* The rest from av[0] are for paths restriction. */ |