[FFmpeg-devel] [PATCH 4/5] version.sh: add a little usage comment

[Michael Niedermayer]

On Thu, Nov 28, 2013 at 05:00:30PM -0800, Timothy Gu wrote:
> Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
> ---
>  version.sh | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/version.sh b/version.sh
> index 99945fd..4cda4d5 100755
> --- a/version.sh
> +++ b/version.sh
> @@ -16,6 +16,8 @@
>  # License along with FFmpeg; if not, write to the Free Software
>  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>  
> +# Usage: version.sh <ffmpeg-root-dir> <output-version.h> <extra-version>
> +
>  # check for git short hash
>  if ! test "$revision"; then
>      revision=$(cd "$1" && git describe --tags --match N 2> /dev/null)

Applying: version.sh: add a little usage comment
fatal: sha1 information is lacking or useless (version.sh).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 version.sh: add a little usage comment
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Those who are too smart to engage in politics are punished by being
governed by those who are dumber. -- Plato 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20131130/48aeaef9/attachment.asc>