about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-08-24 11:23:37 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2015-08-24 11:23:44 +0000
commitfdf48d84fa90ae9dbd8a4948000b490de9e486cf (patch)
treeeb453f7f8bb43162075f74f75dc7ddcaa6600d72
parent3698baaadadfc0f65d818f9d383b67a151e42106 (diff)
downloadzsh-fdf48d84fa90ae9dbd8a4948000b490de9e486cf.tar.gz
zsh-fdf48d84fa90ae9dbd8a4948000b490de9e486cf.tar.xz
zsh-fdf48d84fa90ae9dbd8a4948000b490de9e486cf.zip
36277: _git: Updated for git-clone 2.4.5.
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git7
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7cf645d84..3011ecc9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-24  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 36277: Completion/Unix/Command/_git: _git: Updated for
+	git-clone 2.4.5.
+
 2015-08-24  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* unposted: Etc/FAQ.yo: replace 5.0.9 with 5.1.
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 0d705a9da..a096007d6 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -581,13 +581,14 @@ _git-clone () {
 
   # TODO: Argument to -o should be a remote name.
   # TODO: Argument to -b should complete branch names in the repository being
-  # cloned.
+  # cloned (see __git_references())
   _arguments -w -C -S -s \
     '(-l --local --no-local)'{-l,--local}'[clone locally, hardlink refs and objects if possible]' \
     '(-l --local --no-local)--no-local[override --local, as if file:/// URL was given]' \
     '--no-hardlinks[copy files instead of hardlinking when doing a local clone]' \
     '(-s --shared)'{-s,--shared}'[share the objects with the source repository (warning: see man page)]' \
     '--reference[reference repository]:repository:_directories' \
+    '--dissociate[make the newly-created repository independent of the --reference repository]' \
     '(-q --quiet)'{-q,--quiet}'[operate quietly]' \
     '(-v --verbose)'{-v,--verbose}'[always display the progressbar]' \
     '--progress[output progress even if stderr is not a terminal]' \
@@ -600,8 +601,10 @@ _git-clone () {
     '--template=[directory to use as a template for the object database]: :_directories' \
     '*'{-c,--config}'[<key>=<value> set a configuration variable in the newly created repository]' \
     '--depth[create a shallow clone, given number of revisions deep]: :__git_guard_number depth' \
-    '--single-branch[clone only history leading up to the main branch or the one specified by -b]' \
+    '(--no-single-branch)--single-branch[clone only history leading up to the main branch or the one specified by -b]' \
+    '(--single-branch)--no-single-branch[clone history leading up to each branch]' \
     '--recursive[initialize all contained submodules]' \
+    '--separate-git-dir[place .git dir outside worktree]:path to .git dir:_path_files -/' \
     ': :->repository' \
     ': :_directories' && ret=0