[PATCH] vcs_info: handle missing .git/rebase-apply/{next,msg-clean}

[PATCH] vcs_info: handle missing .git/rebase-apply/{next,msg-clean}

[Daniel Hahler]

From: Daniel Hahler <git@thequod.de>

When pressing Ctrl-C after `git am`, only `last` exists in
`.git/rebase-apply/`, which is empty.

This patch fixes it to fall back to "no patch applied" then.
---
 Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 25 +++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 638ea45..8ecc7c7 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -217,18 +217,21 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
 elif [[ -d "${gitdir}/rebase-apply" ]]; then
     # Fake patch names for all but current patch
     patchdir="${gitdir}/rebase-apply"
-    local cur=$(< "${patchdir}/next")
-    local p subject
-    for p in $(seq $(($cur - 1))); do
-        git_patches_applied+=("$(printf "%04d" $p) ?")
-    done
-    subject="${$(< "${patchdir}/msg-clean")[(f)1]}"
-    if [[ -f "${patchdir}/original-commit" ]]; then
-        git_patches_applied+=("$(< ${patchdir}/original-commit) $subject")
-    else
-        git_patches_applied+=("? $subject")
+    local next="${patchdir}/next"
+    if [[ -f $next ]]; then
+	local cur=$(< $next)
+	local p subject
+	for p in $(seq $(($cur - 1))); do
+	    git_patches_applied+=("$(printf "%04d" $p) ?")
+	done
+	subject="${$(< "${patchdir}/msg-clean")[(f)1]}"
+	if [[ -f "${patchdir}/original-commit" ]]; then
+	    git_patches_applied+=("$(< ${patchdir}/original-commit) $subject")
+	else
+	    git_patches_applied+=("? $subject")
+	fi
+	git_patches_unapplied=($(seq $cur $(< "${patchdir}/last")))
     fi
-    git_patches_unapplied=($(seq $cur $(< "${patchdir}/last")))
 
     VCS_INFO_git_handle_patches
 elif [[ -f "${gitdir}/MERGE_HEAD" ]]; then
-- 
2.5.3.dirty

Re: [PATCH] vcs_info: handle missing .git/rebase-apply/{next,msg-clean}

[Daniel Shahaf]

Daniel Hahler wrote on Wed, Sep 23, 2015 at 20:55:40 +0200:
> From: Daniel Hahler <git@thequod.de>
> 
> When pressing Ctrl-C after `git am`, only `last` exists in
> `.git/rebase-apply/`, which is empty.
> 
> This patch fixes it to fall back to "no patch applied" then.

What needs to happen before this can be pushed?

I've reproduced the problem and confirm the fix works.

Cheers,

Daniel

Re: [PATCH] vcs_info: handle missing .git/rebase-apply/{next,msg-clean}

[Frank Terbeck]

Hey,

Daniel Shahaf wrote:
[...]
> What needs to happen before this can be pushed?
>
> I've reproduced the problem and confirm the fix works.

I've pushed this right now. I thought the other Daniel would have pushed
this himself. Sorry for the delay. :)

Thanks for testing to you and to Daniel Hahler for coming up with the
fix in the first place.


Regards, Frank

Re: [PATCH] vcs_info: handle missing .git/rebase-apply/{next,msg-clean}

[Daniel Hahler]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 28.09.2015 20:05, Frank Terbeck wrote:
> Hey,
> 
> Daniel Shahaf wrote:
> [...]
>> What needs to happen before this can be pushed?
>>
>> I've reproduced the problem and confirm the fix works.
> 
> I've pushed this right now. I thought the other Daniel would have pushed
> this himself. Sorry for the delay. :)
> 
> Thanks for testing to you and to Daniel Hahler for coming up with the
> fix in the first place.

Thanks for reviewing and pushing it.

I wanted to wait for feedback (or silence) before pushing it myself.


Cheers,
Daniel.
-----BEGIN PGP SIGNATURE-----

iEYEARECAAYFAlYJqLkACgkQfAK/hT/mPgAhaACglo5avd/QQYdXlwBrM1YPgR6/
ivwAn2oZ2HJ4QxF1J4J+7i55LqeJCTIv
=EZC+
-----END PGP SIGNATURE-----