Re: [PATCH 1/3] rebase -i: several cleanups

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Tue, 26 Jun 2007, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
> 
> > Support "--verbose" in addition to "-v", show short names in the list
> > comment, clean up if there is nothing to do, and add several "test_ticks"
> > in the test script.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
> > ---
> >  git-rebase--interactive.sh    |   19 +++++++++++++++----
> >  t/t3404-rebase-interactive.sh |    2 ++
> >  2 files changed, 17 insertions(+), 4 deletions(-)
> >
> > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> > index ab36572..b95fe86 100755
> > --- a/git-rebase--interactive.sh
> > +++ b/git-rebase--interactive.sh
> > @@ -60,6 +60,11 @@ die_with_patch () {
> >  	die "$2"
> >  }
> >  
> > +die_abort () {
> > +	rm -rf "$DOTEST" 2> /dev/null
> > +	die "$1"
> > +}
> 
> Why "2>/dev/null" here?

Just to be sure. If it does not exist, it's no error. No sense alarming 
the user.

> > @@ -264,8 +269,11 @@ do
> >  		echo $ONTO > "$DOTEST"/onto
> >  		test t = "$VERBOSE" && : > "$DOTEST"/verbose
> >  
> > +		SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM)
> > +		SHORTHEAD=$(git rev-parse --short $HEAD)
> > +		SHORTONTO=$(git rev-parse --short $ONTO)
> >  		cat > "$TODO" << EOF
> > -# Rebasing $UPSTREAM..$HEAD onto $ONTO
> > +# Rebasing $SHORTUPSTREAM)..$SHORTHEAD onto $SHORTONTO
> 
> What is this close-paren about?  Is it a typo?

Darn. It _is_ a typo. I overlooked it _both_ when typing _and_ when 
looking at the result.

Sorry.

Ciao,
Dscho

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux