diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-16 01:22:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-16 01:22:10 -0700 |
| commit | 5bd148bfe8a4f2df8487e029cd4ee6809bc4c963 (patch) | |
| tree | 1960d9d9011cb728631b357c928745b42d096eda /revision.c | |
| parent | c5f71ad09994b46d80878ce72d1ca6f59935d952 (diff) | |
| parent | c7c84859ad586ae5670224e1abc4f846f7c3a9ae (diff) | |
| download | git-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.tar.gz | |
Merge branch 'maint' to sync with GIT 1.5.2.2
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.c b/revision.c index b12c25e2b0..1f4590b896 100644 --- a/revision.c +++ b/revision.c @@ -1180,7 +1180,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i); if (opts > 0) { - revs->diff = 1; + if (strcmp(argv[i], "-z")) + revs->diff = 1; i += opts - 1; continue; } |