[GUILT] Use git_editor

[GUILT] Use git_editor

[Alan Jenkins]

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>

diff --git a/guilt b/guilt
index 1cef7b9..8d023e9 100755
--- a/guilt
+++ b/guilt
@@ -693,10 +693,6 @@ fi
 series="$GUILT_DIR/$branch/series"
 applied="$GUILT_DIR/$branch/status"
 
-# determine an editor to use for anything interactive (fall back to vi)
-editor="vi"
-[ ! -z "$EDITOR" ] && editor="$EDITOR"
-
 # determine a pager to use for anything interactive (fall back to more)
 pager="more"
 [ ! -z "$PAGER" ] && pager="$PAGER"
diff --git a/guilt-header b/guilt-header
index da46c82..66521ac 100755
--- a/guilt-header
+++ b/guilt-header
@@ -46,7 +46,7 @@ if [ -z "$edit" ]; then
 else
 	do_get_full_header "$GUILT_DIR/$branch/$patch" > "$TMP_MSG"
 	do_get_patch "$GUILT_DIR/$branch/$patch" > "$TMP_DIFF"
-	$editor "$TMP_MSG"
+	git_editor "$TMP_MSG"
 	mv "$GUILT_DIR/$branch/$patch" "$GUILT_DIR/$branch/$patch~"
 
 	(
diff --git a/guilt-new b/guilt-new
index 05318a5..7845d00 100755
--- a/guilt-new
+++ b/guilt-new
@@ -77,7 +77,7 @@ mkdir_dir=`dirname "$GUILT_DIR/$branch/$patch"`
 ) >> "$GUILT_DIR/$branch/$patch"
 
 # edit -e ?
-[ "$edit" = "t" ] && $editor "$GUILT_DIR/$branch/$patch"
+[ "$edit" = "t" ] && git_editor "$GUILT_DIR/$branch/$patch"
 
 if [ ! -z "$force" ]; then
 	(
diff --git a/guilt-series b/guilt-series
index 7d8f8e9..4f24ffd 100755
--- a/guilt-series
+++ b/guilt-series
@@ -22,7 +22,7 @@ do
 done
 
 if [ ! -z "$edit" ]; then 
-	$editor "$series"
+	git_editor "$series"
 elif [ ! -z "$gui" ]; then
 	[ -z "`get_top`" ] && die "No patches applied."
 	bottom=`git rev-parse refs/patches/$branch/$(head -1 $applied)`

Re: [GUILT] Use git_editor

[Josef 'Jeff' Sipek]

On Tue, Sep 30, 2008 at 07:43:50PM +0100, Alan Jenkins wrote:
> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
> 
> diff --git a/guilt b/guilt
> index 1cef7b9..8d023e9 100755
> --- a/guilt
> +++ b/guilt
> @@ -693,10 +693,6 @@ fi
>  series="$GUILT_DIR/$branch/series"
>  applied="$GUILT_DIR/$branch/status"
>  
> -# determine an editor to use for anything interactive (fall back to vi)
> -editor="vi"
> -[ ! -z "$EDITOR" ] && editor="$EDITOR"
> -

Looks good from a quick glance. Any chance there's a git_pager?

Josef 'Jeff' Sipek.

-- 
Bad pun of the week: The formula 1 control computer suffered from a race
condition

Re: [GUILT] Use git_editor

[Alan Jenkins]

Josef 'Jeff' Sipek wrote:
> On Tue, Sep 30, 2008 at 07:43:50PM +0100, Alan Jenkins wrote:
>   
>> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
>>
>> diff --git a/guilt b/guilt
>> index 1cef7b9..8d023e9 100755
>> --- a/guilt
>> +++ b/guilt
>> @@ -693,10 +693,6 @@ fi
>>  series="$GUILT_DIR/$branch/series"
>>  applied="$GUILT_DIR/$branch/status"
>>  
>> -# determine an editor to use for anything interactive (fall back to vi)
>> -editor="vi"
>> -[ ! -z "$EDITOR" ] && editor="$EDITOR"
>> -
>>     
>
> Looks good from a quick glance. Any chance there's a git_pager?
>
> Josef 'Jeff' Sipek.
>   

Not in git-sh-setup.  I did check :-).

Alan

Re: [GUILT] Use git_editor

[Josef 'Jeff' Sipek]

On Tue, Sep 30, 2008 at 08:14:15PM +0100, Alan Jenkins wrote:
> Josef 'Jeff' Sipek wrote:
> > On Tue, Sep 30, 2008 at 07:43:50PM +0100, Alan Jenkins wrote:
> >   
> >> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
> >>
> >> diff --git a/guilt b/guilt
> >> index 1cef7b9..8d023e9 100755
> >> --- a/guilt
> >> +++ b/guilt
> >> @@ -693,10 +693,6 @@ fi
> >>  series="$GUILT_DIR/$branch/series"
> >>  applied="$GUILT_DIR/$branch/status"
> >>  
> >> -# determine an editor to use for anything interactive (fall back to vi)
> >> -editor="vi"
> >> -[ ! -z "$EDITOR" ] && editor="$EDITOR"
> >> -
> >>     
> >
> > Looks good from a quick glance. Any chance there's a git_pager?
> >
> > Josef 'Jeff' Sipek.
> 
> Not in git-sh-setup.  I did check :-).

Interesting! There are definitely places in git that invoke _a_
pager...maybe there's a patch to git that need creating :)

Josef 'Jeff' Sipek.

-- 
Failure is not an option,
It comes bundled with your Microsoft product.

Re: [GUILT] Use git_editor

[Josef 'Jeff' Sipek]

On Tue, Sep 30, 2008 at 07:43:50PM +0100, Alan Jenkins wrote:
> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>

Applied.

Thanks,

Josef 'Jeff' Sipek.

-- 
Don't drink and derive. Alcohol and algebra don't mix.