# [GUILT] Use git_editor 5 messages from 2008-09-30 to 2008-10-01. Participants: Alan Jenkins, Josef 'Jeff' Sipek. Thread: https://gitlist.dev/t/15729 ## Alan Jenkins, 2008-09-30 18:43 Subject: [GUILT] Use git_editor Message-ID: <48E27366.3080503@tuffmail.co.uk> URL: https://gitlist.dev/e/48E27366.3080503%40tuffmail.co.uk ``` Signed-off-by: Alan Jenkins 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)` ``` ## Josef 'Jeff' Sipek, 2008-09-30 19:07 Subject: Re: [GUILT] Use git_editor Message-ID: <20080930190744.GO32444@josefsipek.net> URL: https://gitlist.dev/e/20080930190744.GO32444%40josefsipek.net In-Reply-To: <48E27366.3080503@tuffmail.co.uk> ``` On Tue, Sep 30, 2008 at 07:43:50PM +0100, Alan Jenkins wrote: > Signed-off-by: Alan Jenkins > > 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 ``` ## Alan Jenkins, 2008-09-30 19:14 Subject: Re: [GUILT] Use git_editor Message-ID: <48E27A87.9060205@tuffmail.co.uk> URL: https://gitlist.dev/e/48E27A87.9060205%40tuffmail.co.uk In-Reply-To: <20080930190744.GO32444@josefsipek.net> ``` Josef 'Jeff' Sipek wrote: > On Tue, Sep 30, 2008 at 07:43:50PM +0100, Alan Jenkins wrote: > >> Signed-off-by: Alan Jenkins >> >> 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 ``` ## Josef 'Jeff' Sipek, 2008-09-30 20:22 Subject: Re: [GUILT] Use git_editor Message-ID: <20080930202226.GP32444@josefsipek.net> URL: https://gitlist.dev/e/20080930202226.GP32444%40josefsipek.net In-Reply-To: <48E27A87.9060205@tuffmail.co.uk> ``` 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 > >> > >> 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. ``` ## Josef 'Jeff' Sipek, 2008-10-01 02:31 Subject: Re: [GUILT] Use git_editor Message-ID: <20081001023147.GQ32444@josefsipek.net> URL: https://gitlist.dev/e/20081001023147.GQ32444%40josefsipek.net In-Reply-To: <48E27366.3080503@tuffmail.co.uk> ``` On Tue, Sep 30, 2008 at 07:43:50PM +0100, Alan Jenkins wrote: > Signed-off-by: Alan Jenkins Applied. Thanks, Josef 'Jeff' Sipek. -- Don't drink and derive. Alcohol and algebra don't mix. ```