Re: [PATCH] rebase: fix run_specific_rebase's use of "return" on FreeBSD

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

 



Matthieu Moy wrote:
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 8d7659a..226752f 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -167,13 +167,22 @@ You can run "git stash pop" or "git stash drop" at any time.
>         rm -rf "$state_dir"
>  }
>
> -run_specific_rebase () {
> +run_specific_rebase_internal () {
>         if [ "$interactive_rebase" = implied ]; then
>                 GIT_EDITOR=:
>                 export GIT_EDITOR
>                 autosquash=
>         fi
> +       # On FreeBSD, the shell's "return" returns from the current
> +       # function, not from the current file inclusion.
> +       # run_specific_rebase_internal has the file inclusion as a
> +       # last statement, so POSIX and FreeBSD's return will do the
> +       # same thing.
>         . git-rebase--$type
> +}

Most excellent. Thanks for fixing this.
--
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]