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

Michael Niedermayer michaelni at gmx.at
Sat Nov 30 21:18:17 CET 2013


On Sat, Nov 30, 2013 at 10:30:59AM -0800, Timothy Gu wrote:
> 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

>  version.sh |    2 ++
>  1 file changed, 2 insertions(+)
> c93b88868f534bf6532a03d36fb1405af04d5cee  0001-version.sh-add-a-little-usage-comment.patch
> From e1b0cbd44d38765c6748dc56de43fc7a1a63ba04 Mon Sep 17 00:00:00 2001
> From: Timothy Gu <timothygu99 at gmail.com>
> Date: Thu, 28 Nov 2013 16:57:49 -0800
> Subject: [PATCH 1/3] version.sh: add a little usage comment

applied

thanks

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Observe your enemies, for they first find out your faults. -- Antisthenes
-------------- 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/385e129a/attachment.asc>


More information about the ffmpeg-devel mailing list