diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-25 14:03:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 14:03:50 -0700 |
| commit | 0166592495e21b075fa48225ff21568269bf51d4 (patch) | |
| tree | 21c295f211ad2aeaa798222e7c5564f17a90a429 /builtin-mv.c | |
| parent | 488ee2fe21ca69b90aa2b43dc9e30279a12cca63 (diff) | |
| parent | 205ffa94be8f6492eef4bdaa3315e7fdc7e64e0b (diff) | |
| download | git-0166592495e21b075fa48225ff21568269bf51d4.tar.gz | |
Merge branch 'jc/add-n-u'
* jc/add-n-u:
Make git add -n and git -u -n output consistent
"git-add -n -u" should not add but just report
Conflicts:
builtin-add.c
builtin-mv.c
cache.h
read-cache.c
Diffstat (limited to 'builtin-mv.c')
| -rw-r--r-- | builtin-mv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-mv.c b/builtin-mv.c index fb8ffb41aa..fb906b3fc7 100644 --- a/builtin-mv.c +++ b/builtin-mv.c @@ -256,7 +256,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) for (i = 0; i < added.nr; i++) { const char *path = added.items[i].path; - if (add_file_to_cache(path, verbose)) + if (add_file_to_cache(path, verbose ? ADD_CACHE_VERBOSE : 0)) die("updating index entries failed"); } |