Re: [GUILT 27/28] Minor testsuite fix.

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

 



Signed-off-by: Josef 'Jeff' Sipek <jeffpc@xxxxxxxxxxxxxx>

On Fri, Mar 21, 2014 at 08:32:05AM +0100, Per Cederqvist wrote:
> Fix remove_topic() in t-061.sh so that it doesn't print a git hash.
> 
> Signed-off-by: Per Cederqvist <cederp@xxxxxxxxx>
> ---
>  regression/t-061.out | 1 -
>  regression/t-061.sh  | 2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/regression/t-061.out b/regression/t-061.out
> index ef0f335..60ad56d 100644
> --- a/regression/t-061.out
> +++ b/regression/t-061.out
> @@ -381,7 +381,6 @@ ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba commit	refs/patches/master/mode
>  ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 commit	refs/patches/master/remove
>  % guilt pop -a
>  No patches applied.
> -ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba
>  % git checkout guilt/master
>  Switched to branch "guilt/master"
>  % guilt pop -a
> diff --git a/regression/t-061.sh b/regression/t-061.sh
> index a9a4fea..b573885 100755
> --- a/regression/t-061.sh
> +++ b/regression/t-061.sh
> @@ -15,7 +15,7 @@ old_style_branch() {
>  
>  remove_topic() {
>  	cmd guilt pop -a
> -	if git rev-parse --verify --quiet guilt/master
> +	if git rev-parse --verify --quiet guilt/master >/dev/null
>  	then
>  		cmd git checkout guilt/master
>  	else
> -- 
> 1.8.3.1
> 

-- 
Fact: 12.5% of all statistics are generated randomly.
--
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]