diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-15 12:54:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-15 12:54:19 -0800 |
| commit | cbf1860d73b782e7924e63361df485b31225a26a (patch) | |
| tree | a86ce71a399fb8153be1552f08e51c58b2c5b5cf /diff-no-index.c | |
| parent | 2f4e87d7777a0bcffa8a7cc3cc52e1e8b2c352ff (diff) | |
| parent | 9e2edd66dda418dad751d5eb2e5921e05e57cd30 (diff) | |
| download | git-cbf1860d73b782e7924e63361df485b31225a26a.tar.gz | |
Merge branch 'rs/swap'
Code clean-up.
* rs/swap:
graph: use SWAP macro
diff: use SWAP macro
use SWAP macro
apply: use SWAP macro
add SWAP macro
Diffstat (limited to 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index f420786039..df762fd0f7 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -185,10 +185,8 @@ static int queue_diff(struct diff_options *o, struct diff_filespec *d1, *d2; if (DIFF_OPT_TST(o, REVERSE_DIFF)) { - unsigned tmp; - const char *tmp_c; - tmp = mode1; mode1 = mode2; mode2 = tmp; - tmp_c = name1; name1 = name2; name2 = tmp_c; + SWAP(mode1, mode2); + SWAP(name1, name2); } d1 = noindex_filespec(name1, mode1); |