From e929534199b6be506355d29669367e34181adeb8 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Wed, 16 Dec 2015 22:56:57 +0900 Subject: [PATCH] Fix #362 - Do not show future changes in PlugDiff --- plug.vim | 2 +- test/workflow.vader | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/plug.vim b/plug.vim index 06f6e0d..164663d 100644 --- a/plug.vim +++ b/plug.vim @@ -1998,7 +1998,7 @@ function! s:diff() continue endif - let diff = s:system_chomp('git log --pretty=format:"%h %s (%cr)" "HEAD...HEAD@{1}"', v.dir) + let diff = s:system_chomp('git log --left-only --pretty=format:"%h %s (%cr)" "HEAD...HEAD@{1}"', v.dir) if !empty(diff) call append(1, '') call append(2, '- '.k.':') diff --git a/test/workflow.vader b/test/workflow.vader index b5e2c99..0aba7c3 100644 --- a/test/workflow.vader +++ b/test/workflow.vader @@ -352,6 +352,24 @@ Execute (Reuse Plug window in another tab): q unlet tabnr +Execute (contd. PlugDiff should not show inverted history): + " Additional PlugUpdate to clear diff + PlugUpdate + PlugDiff + Log getline(1, '$') + + " Checking out older revisions + for repo in values(g:plugs) + call system(printf('cd %s && git reset HEAD^ --hard', shellescape(repo.dir))) + endfor + unlet repo + + " PlugDiff should not report the changes i.e. git log --left-only + PlugDiff + Log getline(1, '$') + AssertEqual 'No updates.', getline(1) + q + ********************************************************************** ~ On-demand loading / Partial installation/update ~ **********************************************************************