From 699611cde5cda8b2f2d83a6d6ac9c1e575b74f51 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 28 Nov 2017 14:40:26 -0400 Subject: showStart variant for when there's no worktree file Clean up some uses of showStart with "" for the file, or in some cases, a non-filename description string. That would generate bad json, although none of the commands doing that supported --json. Using "" for the file resulted in output like "foo rest"; now the extra space is eliminated. This commit was sponsored by Fernando Jimenez on Patreon. --- Command/ResolveMerge.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Command/ResolveMerge.hs') diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs index 0ba6efb36..df72e24d4 100644 --- a/Command/ResolveMerge.hs +++ b/Command/ResolveMerge.hs @@ -23,7 +23,7 @@ seek = withNothing start start :: CommandStart start = do - showStart "resolvemerge" "" + showStart' "resolvemerge" Nothing us <- fromMaybe nobranch <$> inRepo Git.Branch.current d <- fromRepo Git.localGitDir let merge_head = d "MERGE_HEAD" -- cgit v1.2.3