VimPlug/vim-fugitive
1
0 Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2026-10-14 00:49:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,446 Commits 11 Branches 17 Tags
083f3c23ccad22b5d2bdabcbb8a076e8c695686b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Pope 083f3c23cc Preserve existing 'scrollbind' arrangement with :Gblame 
Closes https://github.com/tpope/vim-fugitive/issues/1449

Closes https://github.com/tpope/vim-fugitive/issues/1327
 2020-02-03 11:25:49 -05:00
Tim Pope 9ecd6ebf92 Eliminate last temporary :cd 
The new git_chomp and git_chomp_in_tree aren't 100% backwards
compatible, but these functions are deprecated anyways.  Use
system(FugitivePrepare(...)) instead.
 2020-02-03 10:17:37 -05:00
Tim Pope 3221cdfbde Support :Git -c config.name=value 2020-02-02 15:31:02 -05:00
Tim Pope 8e90d82eb4 Use --no-optional-locks for :Gstatus 
This clears up some intermittent errors during :Git rebase, although I
must admit I don't really understand why, as the status reload shouldn't
be happening at the same time :Git is running.
 2020-02-01 10:49:35 -05:00
Tim Pope 1c1014a046 Continue running commands on Vim exit 
Closes https://github.com/tpope/vim-fugitive/issues/1447
 2020-01-30 13:01:17 -05:00
Tim Pope 268a9c1b8f Don't make assumptions about current line number when displaying commit 2020-01-26 17:39:32 -05:00
Tim Pope fc0199555e Extend nvim carriage return workaround to ptys 
References https://github.com/tpope/vim-fugitive/issues/1445
 2020-01-26 15:37:02 -05:00
Tim Pope d926e3beb4 Try to wipe out temp buffer from :read 
Also try to preserve marks.
 2020-01-26 10:57:19 -05:00
Tim Pope 40872a9555 Don't use job pty unless Vim supports it 
Closes https://github.com/tpope/vim-fugitive/issues/1444
 2020-01-26 08:01:34 -05:00
Tim Pope 279d56eb47 Show unpulled before unpushed 
This is what Magit does and I *think* it makes sense because you have to
pull before you can push.
 2020-01-26 07:24:02 -05:00
Tim Pope 54b308eedb Revert work in progress changes 
This partially reverts commit cd7db1d57c.
 2020-01-26 07:24:02 -05:00
Tim Pope 655f7c92f3 Show unpushed and unpulled sections for both upstream and push 
References https://github.com/tpope/vim-fugitive/issues/1436

References https://github.com/tpope/vim-fugitive/issues/1172
 2020-01-25 20:34:28 -05:00
Tim Pope 477f26cf50 Include refs/heads in constructed push commands 
Also swap out :Gpush for :Git push while we are at it.
 2020-01-25 20:20:02 -05:00
Tim Pope 76ffaf4e7d Recognize pull.rebase=preserve in :Gstatus 2020-01-25 18:31:03 -05:00
Tim Pope 90b7d98b6c Temporarily restore User Fugitive autocommand 
References https://github.com/tpope/vim-fugitive/issues/1441
 2020-01-25 11:29:13 -05:00
Tim Pope 4637aca145 Remove tags file warning 
This was the last thing triggering the autoload file before using an
actual Fugitive feature.
 2020-01-24 17:34:41 -05:00
Tim Pope cd7db1d57c Replace old public detection API with hint errors 2020-01-24 17:15:25 -05:00
Tim Pope 036fe0f084 Job environment variables are broken on Neovim 
Closes https://github.com/tpope/vim-fugitive/issues/1443
 2020-01-24 05:46:41 -05:00
Tim Pope 22255613f7 Replace :Gcommit/:Grevert with standard job runner 2020-01-23 05:52:27 -05:00
Tim Pope c989c1f59e Replace :Grebase/:Gmerge/:Gpull with standard job runner 2020-01-23 05:52:27 -05:00
Tim Pope 6b18f7b758 Remove :Gwrite in :Git diff 2020-01-23 05:52:27 -05:00
Tim Pope 8d6f9734c1 Use jobs for :Git 2020-01-23 05:52:27 -05:00
Tim Pope 4301c57f24 Extract helper script creator function 2020-01-23 05:52:27 -05:00
Tim Pope 7f22cc6167 Revert "Specify shell command, not wrapper, in b:dispatch" 
This reverts commit 5bcb42164e.
 2020-01-23 03:49:14 -05:00
Tim Pope 9d62c67737 Remove legacy autocommands 2020-01-22 09:44:07 -05:00
Tim Pope 71038e83f1 Try to use relative path for :Ggrep 
References https://github.com/tpope/vim-fugitive/issues/1439
 2020-01-21 15:29:29 -05:00
Tim Pope 21ed533001 fugitive.vim 3.2 
* Provide :Git mergetool to load conflicts into quickfix list.
* Provide :Git difftool to load arbitrary changesets into quickfix list.
* Call FugitiveBlob/FugitiveCommit/etc autocommands on Fugitive buffer load.
* :Git --paginate display results in temp buffer.
* :Git --no-pager no longer displays results in temp buffer.
* Accomodate loading Fugitive buffers in popup window.
* Better PowerShell support.
* Bug fixes.
 2020-01-21 04:33:16 -05:00
Tim Pope 29153d5ba1 Provide git config --get-all wrapper 2020-01-20 15:42:54 -05:00
Tim Pope 8d4b85ed09 Replace --format with --pretty=format for older Git 2020-01-20 15:42:54 -05:00
Tim Pope 708595d996 Fix comment typo 2020-01-20 15:42:45 -05:00
Tim Pope c48db08e4e Use appropriate slashes for :Dispatch working directory 2020-01-20 10:27:00 -05:00
Tim Pope 2ebdeef9e0 Change :Git --paginate from :terminal to temp buffer 
The --paginate option to Git forces it to use $PAGER rather than its own
configuration, so it makes perfect sense for Fugitive to take on the
role of the pager.

This also removes the same behavior for --no-pager, allowing the command
to run with :! instead.  I really don't like sudden backwards
incompatible changes like this, but the old behavior was based on a bad
understanding of how these options work, and I'd rather rip the band-aid
off sooner rather than later.
 2020-01-20 09:03:49 -05:00
Tim Pope bc0b78ee84 Remove dead code 2020-01-20 08:42:02 -05:00
Tim Pope 5bcb42164e Specify shell command, not wrapper, in b:dispatch 
This frees us up to change :Gfetch not to use :Make.
 2020-01-20 07:28:55 -05:00
Tim Pope 1a6934fc7e Fix FugitiveParse() return value documentation 2020-01-20 07:03:48 -05:00
Tim Pope 397fb99921 Provide FugitiveBlob style autocommands 
This is the real replacement for fugitive#buffer().type(), as the only
real world use of that seemed to be in BufReadPost autocommands.
 2020-01-20 05:52:22 -05:00
Tim Pope 5b1213d0db Fix :Gmerge 2020-01-20 05:52:22 -05:00
Tim Pope ae52b5a96a Better PowerShell support 2020-01-18 01:30:43 -08:00
Tim Pope 9f032ed040 Prevent alternate buffer change loading Fugitive buffer 2020-01-18 00:51:38 -05:00
Tim Pope d428032600 Fix netrw gx in Fugitive buffers AGAIN 2020-01-18 00:45:17 -05:00
Tim Pope c83355d5c5 Accomodate loading Fugitive buffers in popup window 
Closes https://github.com/tpope/vim-fugitive/issues/1418
 2020-01-15 01:26:31 -05:00
Tim Pope 4732bb964a Generalize :Git environment variable overrides 2020-01-14 22:56:11 -05:00
Tim Pope 3e32a55619 Avoid false positives on rebase todo handler 2020-01-14 22:56:11 -05:00
Tim Pope a65db6fcf8 Move :Gmerge warning to top level function 
The old location isn't long for this world.
 2020-01-14 22:56:11 -05:00
Tim Pope 305337a9c1 Begin phasing out :Git --paginate special case 
This was a mistake.  I took --paginate to be the opposite of --no-pager,
but it forces $PAGER over $GIT_PAGER and pager configuration.  This
defeats the purpose of using it as way to trick :Git into running a
regular command with :terminal.

References https://github.com/tpope/vim-fugitive/issues/1415
 2020-01-14 20:43:21 -05:00
Tim Pope 6a638f2392 Match "* Unmerged path" in mergetool 
This happens in leiu of a diff when one of the commits adds (or
presumably removes) the file rather than changing it.
 2020-01-12 18:53:21 -05:00
Tim Pope 6bc345f6f1 Map cmt to :Git mergetool 
References https://github.com/tpope/vim-fugitive/issues/1329
 2020-01-10 20:29:58 -05:00
Tim Pope def982ac4d Softly deprecate :Gmerge for quickfix conflicts 2020-01-10 20:29:15 -05:00
Tim Pope 5fe99dc5df Provide interface for subcommands to set execution options 2020-01-10 19:54:06 -05:00
Tim Pope 394c925381 Fix netrw gx in Fugitive buffers 2020-01-09 21:34:35 -05:00
Tim Pope 4074727343 Really fix packed ref handling in :Gbrowse 
References https://github.com/tpope/vim-fugitive/issues/1428
 2020-01-06 16:00:21 -05:00
Tim Pope cfa7bdc82a Handle packed refs in :Gbrowse 
Closes https://github.com/tpope/vim-fugitive/issues/1428
 2020-01-06 13:33:49 -05:00
Tim Pope ddd64fc4c5 Provide :Git difftool and :Git mergetool 
Closes https://github.com/tpope/vim-fugitive/issues/132
 2020-01-05 21:41:18 -05:00
Tim Pope 2bcf755c6e Run QuickFix autocommands on :Gclog 2020-01-05 16:36:11 -05:00
Tim Pope 295f41bbf4 Save diff context in :Gclog 2020-01-05 16:17:58 -05:00
Tim Pope 9ec6b55d03 Improve display of :Gclog --summary 2020-01-05 01:50:24 -05:00
Tim Pope 3604fab3b7 Fix whitespace in README 2020-01-05 01:50:24 -05:00
Tim Pope 6d011f1ea5 Improve :Gclog window title 2020-01-05 00:36:36 -05:00
Tim Pope 726fdf1c94 Support ...commit as HEAD...commit 2020-01-03 19:47:08 -05:00
Tim Pope 3bf602b13d Use underlying commit not tag for :Gedit tag:path 2019-12-27 17:19:42 -05:00
Tim Pope 3729c351e1 Fix unknown function error on Vim < 7.2.061 2019-12-27 17:19:42 -05:00
Tim Pope 7848779d3b Don't error if we can't :bwipeout 
References https://github.com/tpope/vim-fugitive/issues/1418
 2019-12-27 17:19:42 -05:00
Tim Pope 6d4564a05e Fix timer invocation 
References https://github.com/tpope/vim-fugitive/issues/1329
 2019-12-07 10:14:14 -05:00
Tim Pope 5d37b17e34 Match Git semantics for GIT_CEILING_DIRECTORIES symlink resolution 
Also support a generic g:ceiling_directories that can be shared with
other plugins that do this sort of detection.

References https://github.com/tpope/vim-fugitive/issues/1412
 2019-12-06 18:03:32 -05:00
Tim Pope b48a572475 Use timers to avoid Vim patch 8.1.1756 
Closes https://github.com/tpope/vim-fugitive/issues/1329
 2019-12-06 14:39:27 -05:00
Tim Pope e1ab8fff09 Handle both amended and new commits during rebase 
References https://github.com/tpope/vim-fugitive/issues/1329
 2019-12-06 14:39:27 -05:00
Tim Pope d3a2bdbe2c Don't abort rebase after committing on last step 
References https://github.com/tpope/vim-fugitive/issues/1329
 2019-12-06 14:12:35 -05:00
Tim Pope 42c6fd1440 Don't override explicit empty string for core.askPass 
References https://github.com/tpope/vim-fugitive/issues/1410
 2019-12-06 12:56:59 -05:00
Tim Pope 671a85daba Fix erroneous ? escaping in * pattern 2019-11-30 17:19:52 -05:00
Tim Pope 6d9dd103c0 Fix false positive matching filename in blame 2019-11-30 17:15:44 -05:00
Tim Pope 3b1da8b217 Remove debugging function 2019-11-27 16:34:28 -05:00
Tim Pope 67efbf66e0 Don't fall back to pwd for Git dir of blank filename 
In particular, this fixes `FugitiveFind(..., '')` to respect the empty
Git dir argument rather than falling back to detection on the current
working directory.  Which in turn fixes :Gstatus using the current
working directory when called from a buffer that does not belong to a
repository.

References https://github.com/tpope/vim-fugitive/issues/1408
 2019-11-27 15:27:52 -05:00
Tim Pope eed46c1f24 Perform automatic :diffoff on :Gdiffsplit /external/file buffers 
Closes https://github.com/tpope/vim-fugitive/issues/1402
 2019-11-21 22:08:37 -05:00
Tim Pope dc5320630d Provide explanatory error on :Gdiff ~ 
References https://github.com/tpope/vim-fugitive/issues/1402
 2019-11-19 17:48:43 -05:00
Tim Pope 13fdeb5fa7 Don't show bogus unstaged changes in bare repository 
References https://github.com/tpope/vim-fugitive/pull/1262
 2019-11-17 22:19:33 -05:00
Tim Pope a2d76c4583 Fix completion of stash@\{<Tab> 
References https://github.com/tpope/vim-fugitive/issues/1396
 2019-11-16 19:48:31 -05:00
Tim Pope 0004f585fd Don't use arrow notation for unstaged modifications 
Closes https://github.com/tpope/vim-fugitive/issues/1392
 2019-11-15 20:31:29 -05:00
Tim Pope b24f98fbb1 Cache fugitive#Head() to minimize statusline IO 
Closes https://github.com/tpope/vim-fugitive/issues/1384
 2019-11-15 20:05:18 -05:00
Tim Pope 8c84ea6fdb Replace --no-patch with -s for Git < 1.8.4 
Closes https://github.com/tpope/vim-fugitive/issues/1398
 2019-11-12 21:31:36 -05:00
Tim Pope 1e57d678ba Add PayPal donation link 2019-11-08 17:41:09 -05:00
Tim Pope f6acae50ea Improve robustness of status --porcelain=v1 parsing 
References https://github.com/tpope/vim-fugitive/issues/1388
 2019-10-27 18:53:19 -04:00
Tim Pope 0356edf6b8 Optimize away log calls in :Gstatus if no upstream changes 2019-10-26 09:05:49 -04:00
Tim Pope e8c5b604db Improve robustness of status --porcelain=v2 parsing 
Closes https://github.com/tpope/vim-fugitive/issues/1388
 2019-10-26 08:49:23 -04:00
Tim Pope b09c5d2523 Resolve symlinks in configured work tree 
Closes https://github.com/tpope/vim-fugitive/issues/1382
 2019-10-22 05:13:42 -04:00
Tim Pope 395d947644 Force --no-edit on squash maps 
References https://github.com/tpope/vim-fugitive/pull/1378
 2019-10-20 15:37:41 -04:00
Tim Pope 06e34204af Fix error message on blank buffer with no Git dir 2019-10-11 17:21:16 -04:00
Tim Pope 427ac52d7d fugitive.vim 3.1 
* Commands are now global, not buffer local.
* Calling a command in an unnamed buffer uses the working directory.
* Preserve line number on :Gedit to return to work tree buffer.
* Better submodule support in :Gstatus.
* Support git-blame revision ignoring features.
* Show first parent diff in merge commit buffer.
* Remove deprecated support for .git/tags.
* Bug fixes.
 2019-10-10 19:47:39 -04:00
Tim Pope 8c29bf1bb9 Tab complete > arguments 2019-10-10 19:45:25 -04:00
Tim Pope ea818f1fab Include PowerShell in check for win32 shell 
Closes https://github.com/tpope/vim-fugitive/issues/435
 2019-10-09 11:33:53 -04:00
Tim Pope 28abadcb84 Fix incorrect script id from nested function call 
Closes https://github.com/tpope/vim-fugitive/pull/1370
 2019-10-07 12:08:12 -04:00
Tim Pope c9cf1b3cb2 Make remaining buffer commands global 2019-10-02 14:40:38 -04:00
Tim Pope cfdfc1ba14 Clearer error message on attempt to delete directory 
Recursive deletion is too dangerous to provide without a confirmation
prompt.

Closes https://github.com/tpope/vim-fugitive/issues/1364
 2019-10-02 14:01:22 -04:00
Tim Pope 5eeb7625df Expand status file lookup into nested structure 
References https://github.com/tpope/vim-fugitive/pull/1337
 2019-10-01 16:19:36 -04:00
Tim Pope 4f0905e963 Preserve line number on :Gedit with no or > argument 
Closes https://github.com/tpope/vim-fugitive/pull/1326
 2019-10-01 15:43:12 -04:00
Tim Pope f72ca2e6c1 Improve ++opt +cmd handling for :Gedit/:Gread 2019-09-30 20:43:16 -04:00
Tim Pope 621ffb087a Fix :'<,'>Gclog on some Vim versions 
This was an attempt to get out in front of issues like
https://github.com/tpope/vim-scriptease/issues/43, but looks like it has
problems of its own.

Closes https://github.com/tpope/vim-fugitive/issues/1358
 2019-09-30 19:07:04 -04:00
Tim Pope 24b463b5b3 Support REVERT_HEAD and CHERRY_PICK_HEAD 2019-09-30 17:53:11 -04:00
Tim Pope eedfd2a570 Don't show tags warning when editing commit message 2019-09-28 11:14:30 -04:00
Tim Pope ab26e9fdb3 Trigger User FugitiveChanged on events that change repository 
Note that in the context of this event, Fugitive functions will use the
changed repository, which might not be the same as the current buffer's
repository.  Pass bufnr() as the optional dir argument to force the
current buffer.

Closes https://github.com/tpope/vim-fugitive/issues/458
 2019-09-27 09:30:40 -04:00
Tim Pope fee14c149c Don't reload status on non-Fugitive ShellCmdPost 2019-09-27 09:30:40 -04:00