diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-07 15:02:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-07 15:02:11 -0400 |
| commit | 39933fd1b6408e08549af1f9e852bf711ccf4ad8 (patch) | |
| tree | b0cee60f9393c09a89e634ea3e96872a965a6b25 /doc/todo | |
| parent | 7044c30d565dc1555f719bb46848c1316c1f838e (diff) | |
sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end.
Diffstat (limited to 'doc/todo')
| -rw-r--r-- | doc/todo/wishlist:_detection_of_merge_conflicts.mdwn | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn b/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn index 1824a91ee..1b4caeff0 100644 --- a/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn +++ b/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn @@ -1,3 +1,13 @@ A conflict during sync or merge is something that requires user intervention, or at least notification. For that reason it would be nice if git annex returned a nonzero exit status when such a conflict happened during a sync or a merge. This is what git does after a conflicting pull, and would make it easier to spot a conflict in automated syncs without having to parse annex output or the logs. +> Good idea, [[done]]. --[[Joey]] + Also, it would be nice if your new `git annex status` were able to inform about remaining conflicts in the repo, for instance by reporting files with variant-XXX suffix. + +> Hmm, that would need a separate pass through the whole tree, since +> currently it can use `git ls-files` to find only modified/deleted/new +> files. I would rather not make the new `git annex status` slower for +> this. +> +> It would be possible to add it to `git annex info` (old `status`) +> which already has to look through the entire work tree. |