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

[Timothy Gu]

On Sat, Nov 30, 2013 at 6:09 AM, Michael Niedermayer <michaelni at gmx.at> wrote:
> 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".

Fixed.

Timothy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-version.sh-add-a-little-usage-comment.patch
Type: text/x-patch
Size: 664 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20131130/aa219c1a/attachment.bin>