| 1 |
On Mon, 31 Oct 2016 07:16:24 +0000 (UTC) |
| 2 |
Martin Vaeth <martin@×××××.de> wrote: |
| 3 |
|
| 4 |
> Michał Górny <mgorny@g.o> wrote: |
| 5 |
> > + if quiet: # -q needs to go first |
| 6 |
> > + update_index_cmd.append('-q') |
| 7 |
> |
| 8 |
> The options -q --unmerged (which are implicitly passed by "git status") |
| 9 |
> are not only to suppress verbosity: |
| 10 |
> The git-update-index man page has to say for these options: |
| 11 |
> |
| 12 |
> : the default behavior is to error out. This option makes |
| 13 |
> : git update-index continue anyway. |
| 14 |
> |
| 15 |
> and if I understood the git source code correctly, without |
| 16 |
> these options git will indeed break some loops early in the |
| 17 |
> "error" case, i.e. it will perhaps not do a full update of |
| 18 |
> the index in the "error" case. |
| 19 |
|
| 20 |
It's a 'best effort' attempt at making git not error out |
| 21 |
in the following merge. If it doesn't work, the merge will print |
| 22 |
the error. |
| 23 |
|
| 24 |
-- |
| 25 |
Best regards, |
| 26 |
Michał Górny |
| 27 |
<http://dev.gentoo.org/~mgorny/> |
Archives