From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM autolearn=no autolearn_force=no version=3.4.4 Received: (qmail 21012 invoked from network); 4 Nov 2021 19:09:49 -0000 Received: from 4ess.inri.net (216.126.196.42) by inbox.vuxu.org with ESMTPUTF8; 4 Nov 2021 19:09:49 -0000 Received: from mail-pl1-f182.google.com ([209.85.214.182]) by 4ess; Thu Nov 4 15:02:52 -0400 2021 Received: by mail-pl1-f182.google.com with SMTP id n8so8842081plf.4 for <9front@9front.org>; Thu, 04 Nov 2021 12:02:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:mime-version:content-disposition; bh=0TW3AapRPII/unLFKyMWenUkJphTataL+6u9ZTBJbwE=; b=dtOMKXU/3zR1XgCYtBu3HQEcEUqdm8qlrj6SmAQ9PaE9Ycn5CfIcSTpXwkIJE6MxOK cJ6Mrm+xBHunLvkV2d3KleEyWWaOI4klG/lEE7n4g+l907Ltg0eoLQQ1zrg7u8s6hvNb jR5ra9eqzfpc7XIUsluN9C7p0bIhnhAczd6oS0B9RBhbcc4XU27qzG0b7fJDcDB6IObp uaXGbfrHqggz+g5gV6H54cnCgN7YWEMcx2Ro7QxYKwx+nCTk7fBbTSoq923VkH3QGodr ZgpuTb6I53m/n4NziNUUBFeEFR/yXsGnc/k0ZCAm2joj1LQdiZTacDpHLQTZLxivbxKC 6WYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition; bh=0TW3AapRPII/unLFKyMWenUkJphTataL+6u9ZTBJbwE=; b=acHGZ0GRv36Uu8b2Ed521rJdk6bYWYEV5Z75aOYhFNZB74TVltsBb+Jg+YWHFfrq9p OBC4RxbNBniOvBlVEpqMmWY+OaGRyjN1plPdkqY/B/mf/N3tXJw0g8vgKzBi3Kae+JUp 2nRMZcPxAam1pKluRoqsGICmyiVN3DjTq1pDCi+HBQYhtVS+Z1g41kTo1o35MwO4SJxx GK5FxAHFt9BmYTeLomtQb2wwrYx+IEJajfc36Xt5mFM8ZRypAlS+9JDDoJuGQlzYPFQZ rAlJz76fxAqPIrr/+0Cz/+KzJCvCAMFRcxfvBuOJydQQtQypSUjPKynAXDu15/7OE5QN wZxQ== X-Gm-Message-State: AOAM532GzI1EeKHzGJCS3uYzHuKT31IXKNibng9megDlQ3pN+XiUIXkb 6ok1et7PdXW8hbOm03fWZKMVZ2VhSmo= X-Google-Smtp-Source: ABdhPJxW6AMrGUFE5umS/IJuhW48AknkmmCTPt8S4/EDy8izmkh+Fag9lxAQk1FJhu5Q6QJkkjpcDg== X-Received: by 2002:a17:902:bd01:b0:141:6232:6f89 with SMTP id p1-20020a170902bd0100b0014162326f89mr46339997pls.12.1636052564702; Thu, 04 Nov 2021 12:02:44 -0700 (PDT) Return-Path: Received: from imac.0x30.net (d205-250-121-157.bchsia.telus.net. [205.250.121.157]) by smtp.gmail.com with ESMTPSA id o19sm5908023pfu.56.2021.11.04.12.02.43 for <9front@9front.org> (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 04 Nov 2021 12:02:44 -0700 (PDT) Date: Thu, 4 Nov 2021 12:02:42 -0700 From: Kyle Milz To: 9front@9front.org Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="git_revert_args.diff" List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: compliant service table storage grid-scale template Subject: [9front] git/revert: fix empty invocation Reply-To: 9front@9front.org Precedence: bulk hi, git/revert requires a file name argument, but when none is given it fails in a strange way: % git/revert usage: cleanname [-d pwd] name... /bin/git/revert:15: null list in concatenation it looks like getflags does not verify *arguments*, and the 'args' variable is only used by aux/usage. diff below adds a check for a nonzero amount of arguments. here is the new output: % git/revert usage: revert [-c query] file ... i tested -c to make sure it works like it did without this change. kyle diff 3f495077869362629de9d0c0b070ffca10ceb729 uncommitted --- a/sys/src/cmd/git/revert +++ b/sys/src/cmd/git/revert @@ -5,7 +5,8 @@ gitup flagfmt='c:query query' args='file ...' -eval `''{aux/getflags $*} || exec aux/usage +if (! eval `''{aux/getflags $*} || ~ $#* 0) + exec aux/usage commit=$gitfs/HEAD if(~ $#query 1)