From 292d332bfbaa4714c11006ac8a9d66a7aa519448 Mon Sep 17 00:00:00 2001 From: Leonid Volnitsky Date: Tue, 17 Jun 2008 09:42:24 +0300 Subject: fix: when doing "rebase -i" there are files called "unmerged" in status. Now collected into modified_files --- prompt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'prompt') diff --git a/prompt b/prompt index 0cc25b1..428a892 100755 --- a/prompt +++ b/prompt @@ -264,7 +264,8 @@ PROMPT_COMMAND=' /^# Changed but not updated:/,/^# [A-Z]/ { s/^# Changed but not updated:/modified=modified/p - s/# modified: /git_modified_files+=\" \"/p + s/^# modified: /git_modified_files+=\" \"/p + s/^# unmerged: /git_modified_files+=\" \"/p } /^# Changes to be committed:/,/^# [A-Z]/ { -- cgit v1.2.3 From 838c56b1e2c561b8799d1995ccc5578bdc90566b Mon Sep 17 00:00:00 2001 From: Leonid Volnitsky Date: Wed, 18 Jun 2008 10:34:50 +0300 Subject: fix: send stderr from git status to /dev/null --- prompt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'prompt') diff --git a/prompt b/prompt index 428a892..85462e6 100755 --- a/prompt +++ b/prompt @@ -251,7 +251,7 @@ PROMPT_COMMAND=' git_dir=`git-rev-parse --git-dir 2> /dev/null` if [[ $git_dir ]]; then - eval `git status | + eval `git status 2>/dev/null | sed -n " s/^# On branch /branch=/p -- cgit v1.2.3