diff mbox series

git-undescr.sh: Support full output of git-descr.sh.

Message ID f457ec03-90f1-495c-5fff-f5b9c556f313@suse.cz
State New
Headers
Series git-undescr.sh: Support full output of git-descr.sh. |

Commit Message

Martin Liška Jan. 27, 2022, 6:29 p.m. UTC 
  I would like to support:

$ git gcc-undescr `git gcc-descr`
9cbfbe2497c0117b0598e35658248bc723c0b931

Which is done in the patch.

Ready to be installed?
Thanks,
Martin

contrib/ChangeLog:

	* git-undescr.sh: Support full output of git-descr.sh.
---
  contrib/git-undescr.sh | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jakub Jelinek Jan. 27, 2022, 6:33 p.m. UTC | #1 
On Thu, Jan 27, 2022 at 07:29:20PM +0100, Martin Liška wrote:
> I would like to support:
> 
> $ git gcc-undescr `git gcc-descr`
> 9cbfbe2497c0117b0598e35658248bc723c0b931
> 
> Which is done in the patch.
> 
> Ready to be installed?
> Thanks,
> Martin
> 
> contrib/ChangeLog:
> 
> 	* git-undescr.sh: Support full output of git-descr.sh.

Ok.

	Jakub
diff mbox series

Patch

diff --git a/contrib/git-undescr.sh b/contrib/git-undescr.sh
index 7d2efe1a8e7..9d882a6814e 100755
--- a/contrib/git-undescr.sh
+++ b/contrib/git-undescr.sh
@@ -3,8 +3,8 @@ 
  # Script to undescribe a GCC revision
  
  o=$(git config --get gcc-config.upstream);
-r=$(echo $1 | sed -n 's,^r\([0-9]\+\)-[0-9]\+$,\1,p');
-n=$(echo $1 | sed -n 's,^r[0-9]\+-\([0-9]\+\)$,\1,p');
+r=$(echo $1 | sed -n 's,^r\([0-9]\+\)-[0-9]\+\(-g[0-9a-f]\+\)\?$,\1,p');
+n=$(echo $1 | sed -n 's,^r[0-9]\+-\([0-9]\+\)\(-g[0-9a-f]\+\)\?$,\1,p');
  
  test -z $r && echo Invalid id $1 && exit 1;
  h=$(git rev-parse --verify --quiet ${o:-origin}/releases/gcc-$r);