Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH] vcs_info git: error before start of rebase
- X-seq: zsh-workers 34673
- From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH] vcs_info git: error before start of rebase
- Date: Sat, 7 Mar 2015 04:21:40 +0000
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=x-sasl-enc:date:from:to:subject:message-id :mime-version:content-type; s=mesmtp; bh=1wPasKFZMA6DoT7GOoFzsQ8 zLwI=; b=ljYbFaJ2FMhD6NgaMIXsXZLX+ilFhdsILXSYazyN3VuwaxCVVCpJHAl 9nI9MhAgdVeVGY4OAw9ICW8ZqWb9cwN1ZxPJ87kcNgiztfbDWL9FoYtBFg6XqGhP YWk3X++F3ijS2+GX7HScezmRyGmf9/1OV0C5ShYyqzpAtvCS6jf8=
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:date:from:to:subject :message-id:mime-version:content-type; s=smtpout; bh=1wPasKFZMA6 DoT7GOoFzsQ8zLwI=; b=ftbVYHduT5QpFIVIyt3YTjMDBpvUFLaji6R6hb8+8sf G/AHp1t4fG2AJW8fFm7vZECDabe4U7fMMtn5KIap24Kt4SdO4dKIgRIlbDyOm9rB JOjqW0uLeYvl4oSqP4KDpZzWQBxLGaOPFIeRZ+U7X2ukNApxbFrJwOE8cVQFwyH0 =
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
The following:
1. git rebase -i HEAD^
2. While editor is running, open a shell.
... results in a warning message before the prompt:
VCS_INFO_get_data_git:208: no such file or directory: .git/rebase-merge/done
Proposed fix:
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 48d552f..c348da2 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -205,6 +205,7 @@ then
elif [[ -d "${gitdir}/rebase-merge" ]]; then
patchdir="${gitdir}/rebase-merge"
local p
+ [[ -f "${patchdir}/done" ]] &&
for p in ${(f)"$(< "${patchdir}/done")"}; do
# remove action
git_patches_applied+=("${${(s: :)p}[2,-1]}")
Cheers,
Daniel
Messages sorted by:
Reverse Date,
Date,
Thread,
Author