From b1a4b3ccc5250dcec694ddd407567144da907dc4 Mon Sep 17 00:00:00 2001 From: Leonid Volnitsky Date: Wed, 18 Jun 2008 22:17:17 +0300 Subject: fix: new file were not collected, sed expr corrected. --- prompt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prompt b/prompt index 85462e6..99c2e84 100755 --- a/prompt +++ b/prompt @@ -258,8 +258,8 @@ PROMPT_COMMAND=' s/^nothing to commit (working directory clean)/clean=clean/p /^# Untracked files:/,/^[^#]/{ - s/^# /git_untracked_files+=\" \"/p s/^# Untracked files:/untracked=untracked/p + s/^# /git_untracked_files+=\" \"/p } /^# Changed but not updated:/,/^# [A-Z]/ { @@ -271,7 +271,7 @@ PROMPT_COMMAND=' /^# Changes to be committed:/,/^# [A-Z]/ { s/^# Changes to be committed:/added=added/p s/^# modified: /git_added_files+=\" \"/p - s/^# new file: /git_added_files+=\" \"/p + s/^# new file: /git_added_files+=\" \"/p } " ` -- cgit v1.2.3 From 84b842cc8190d8b0cc3c3a7eaa51b13d8bd6ac69 Mon Sep 17 00:00:00 2001 From: Leonid Volnitsky Date: Wed, 18 Jun 2008 22:08:55 +0300 Subject: script to make screen-shots --- demo-script | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 demo-script diff --git a/demo-script b/demo-script new file mode 100644 index 0000000..2fa37a2 --- /dev/null +++ b/demo-script @@ -0,0 +1,38 @@ +# git +. /t/prompt/prompt +rm -rf tiny.git/ +mkdir tiny.git +cd tiny.git +git init +echo v1 > a-file +git add a-file +touch an-untracked +rm an-untracked +git commit -m v1 a-file + + +.. +. /t/prompt/prompt +clear +rm -rf tiny.git/ +mkdir tiny.git +cd tiny.git +git init +echo v1 > file +git add file +touch untracked-file +rm untracked-file +git commit -m v1 file +git checkout -b test +echo 'added 2nd line in test' >> file +git add file +git commit -m v2test +git checkout master +cat file +echo 'now added 2nd line in master' >> file +git add file +echo 'added 3nd line in master' >> file +git add file +git commit -m v2 +git merge test + -- cgit v1.2.3 From 2e6ea2f3b51e8f16c1793c243dc9a9410ce8211e Mon Sep 17 00:00:00 2001 From: Leonid Volnitsky Date: Sat, 21 Jun 2008 23:23:35 +0300 Subject: can not cd to stats/, shows detached dir --- prompt | 1 + 1 file changed, 1 insertion(+) diff --git a/prompt b/prompt index 01567cf..d68f859 100755 --- a/prompt +++ b/prompt @@ -271,6 +271,7 @@ PROMPT_COMMAND=' s/^# Changes to be committed:/added=added/p s/^# modified: /git_added_files+=\" \"/p s/^# new file: /git_added_files+=\" \"/p + s/^# renamed: /git_added_files+=\" \"/p } " ` -- cgit v1.2.3 From c071fe3faea6d2d956748835c1e705035c1bf601 Mon Sep 17 00:00:00 2001 From: Leonid Volnitsky Date: Sat, 21 Jun 2008 23:37:27 +0300 Subject: added handling of renamed files to git status --- prompt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prompt b/prompt index d68f859..a3e955e 100755 --- a/prompt +++ b/prompt @@ -271,7 +271,7 @@ PROMPT_COMMAND=' s/^# Changes to be committed:/added=added/p s/^# modified: /git_added_files+=\" \"/p s/^# new file: /git_added_files+=\" \"/p - s/^# renamed: /git_added_files+=\" \"/p + s/^# renamed:[^>]*> /git_added_files+=\" \"/p } " ` -- cgit v1.2.3 From bb1e87b53c6461b8ede8091ae2938a63cd55dd17 Mon Sep 17 00:00:00 2001 From: Leonid Volnitsky Date: Mon, 23 Jun 2008 00:57:30 +0300 Subject: compied: added --- prompt | 1 + 1 file changed, 1 insertion(+) diff --git a/prompt b/prompt index a3e955e..3440eff 100755 --- a/prompt +++ b/prompt @@ -272,6 +272,7 @@ PROMPT_COMMAND=' s/^# modified: /git_added_files+=\" \"/p s/^# new file: /git_added_files+=\" \"/p s/^# renamed:[^>]*> /git_added_files+=\" \"/p + s/^# copied:[^>]*> /git_added_files+=\" \"/p } " ` -- cgit v1.2.3