From 63b1dcd284df2a5dbb37bb0af3cdd13553576a85 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Thu, 27 Aug 2015 22:45:49 +0000
Subject: 36304: _git-cat-file: Fix regression in 36237

This broke 'git cat-file blob origin:Etc/<TAB>'.
---
 ChangeLog                    | 5 +++++
 Completion/Unix/Command/_git | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7a90e7569..0d858b0b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-27  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 36304: Completion/Unix/Command/_git: _git-cat-file: Fix
+	regression in 36237
+
 2015-08-27  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* unposted (cf. Axel Beckert 36292): Test/A05execution.ztst:
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index a096007d6..740969903 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6008,6 +6008,7 @@ __git_tree_files () {
 
   if [[ $1 == --root-relative ]]; then
     extra_args+=(--full-tree)
+    shift
   fi
 
   zparseopts -D -E -a compadd_opts V: J: 1 2 n f X: M: P: S: r: R: q F:
-- 
cgit 1.4.1