From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alexander Kuleshov Newsgroups: gmane.emacs.bugs Subject: bug#24046: [PATCH] vc-git: prevent execution of git stash in error cases Date: Thu, 21 Jul 2016 18:46:18 +0600 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a114035e27ac7b9053824b590 X-Trace: ger.gmane.org 1469105248 7802 80.91.229.3 (21 Jul 2016 12:47:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 21 Jul 2016 12:47:28 +0000 (UTC) To: 24046@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jul 21 14:47:17 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bQDNl-0005Ic-2o for geb-bug-gnu-emacs@m.gmane.org; Thu, 21 Jul 2016 14:47:17 +0200 Original-Received: from localhost ([::1]:40526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQDNj-0004Od-Ug for geb-bug-gnu-emacs@m.gmane.org; Thu, 21 Jul 2016 08:47:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQDNY-0004Ml-4s for bug-gnu-emacs@gnu.org; Thu, 21 Jul 2016 08:47:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQDNW-0005P5-89 for bug-gnu-emacs@gnu.org; Thu, 21 Jul 2016 08:47:03 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:47027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQDNW-0005P0-51 for bug-gnu-emacs@gnu.org; Thu, 21 Jul 2016 08:47:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bQDNV-00063r-SX for bug-gnu-emacs@gnu.org; Thu, 21 Jul 2016 08:47:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Alexander Kuleshov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 21 Jul 2016 12:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 24046 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.146910521123281 (code B ref -1); Thu, 21 Jul 2016 12:47:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 21 Jul 2016 12:46:51 +0000 Original-Received: from localhost ([127.0.0.1]:59364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bQDNL-00063R-4M for submit@debbugs.gnu.org; Thu, 21 Jul 2016 08:46:51 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:48239) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bQDNJ-00063E-WA for submit@debbugs.gnu.org; Thu, 21 Jul 2016 08:46:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQDND-0005Kw-QH for submit@debbugs.gnu.org; Thu, 21 Jul 2016 08:46:44 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:60200) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQDND-0005Kh-Mq for submit@debbugs.gnu.org; Thu, 21 Jul 2016 08:46:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQDNB-0004Av-Bi for bug-gnu-emacs@gnu.org; Thu, 21 Jul 2016 08:46:42 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQDNA-0005KJ-I9 for bug-gnu-emacs@gnu.org; Thu, 21 Jul 2016 08:46:41 -0400 Original-Received: from mail-lf0-x22d.google.com ([2a00:1450:4010:c07::22d]:36426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQDN9-0005K6-ON for bug-gnu-emacs@gnu.org; Thu, 21 Jul 2016 08:46:40 -0400 Original-Received: by mail-lf0-x22d.google.com with SMTP id g62so60852014lfe.3 for ; Thu, 21 Jul 2016 05:46:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to; bh=ePn5I7zYrrkaIoivwhEew/T8zCJ6NFzO9JrmDR+wB9o=; b=zQQwV74G0l/ytNiK5UAoj4X+YTxNKMQ8T2/tIHmN2oGa+UR7EgNPKJhkXcBJ599Mkw pgs19QU3MmhW3gt4dWmaFh0F5augqCx33B6N8O+InaNUwDr763hwFgHb5X+5lY4YNhcu n4KnB54HbtyFdv2DyaEb44KouXwEKIEqMWqKgMh+ctkrOToOyZRCwe9+gm573DeEhDDX FnggHwJd3MyuleD0IkJIqMdRlDMXashwRbmgru7mkHittA6m+LpX/PhvgH4TLvwG5CKb 2GQMh8yi0v7pCZ6+wkl6Qp/bS1QgTs3xeZhWUB1PTEUMPhT8fbF6mWRZoAQ8fDA4Dwxs pFRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=ePn5I7zYrrkaIoivwhEew/T8zCJ6NFzO9JrmDR+wB9o=; b=iZKR4rSsKb2jL2UHVQuVP3aOZOScsgjO5aLbPns8blmQXdi7zfWc0RdUFHwxhz1Dt8 Y77BtIZrHbs7/e/G+/zcBcul5IGSuS0gWESrbDsyQUXoOzSAj3cDN+Y7D9T5DVAIfjGp jvCn1xROpUgLyg2t86LCexSS/GZBO85Roa0fc7JKiiHWl0ni0IW8PPs8t5jfnwmTVssq 0D2zwxxMYFxcU+Tiff1U0w6uTYVHl6VkgiKtFJxV8mMsoXLQEdNnnaOD2VcJ0HbsNYr7 Fh078cDw52a4wwK+8JrzGF+bR9ong4vsHK4JMGdjiOAV26Nv9ulISDxuoAMkz5BKvuhd m7pQ== X-Gm-Message-State: ALyK8tI1VVi055VQqM9/19mPEORAFrjmLtdF6joh37SH0Us3GRWW5iLkzAJOs7wKlnjp+htCoys7oV8jBAPTzA== X-Received: by 10.25.152.135 with SMTP id a129mr21148077lfe.226.1469105198247; Thu, 21 Jul 2016 05:46:38 -0700 (PDT) Original-Received: by 10.25.145.17 with HTTP; Thu, 21 Jul 2016 05:46:18 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:121376 Archived-At: --001a114035e27ac7b9053824b590 Content-Type: text/plain; charset=UTF-8 Here is simple patch which adds two additional checks to the vc-git-stash-show function to check that correct stash name is passed and actually repo has stashes. Thank you --001a114035e27ac7b9053824b590 Content-Type: text/x-patch; charset=US-ASCII; name="0001-vc-git-prevent-execution-of-git-stash-in-error-cases.patch" Content-Disposition: attachment; filename="0001-vc-git-prevent-execution-of-git-stash-in-error-cases.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iqwbafu20 RnJvbSBmOWZjNjQ1NjBkY2Y4OTI4MjZlZGRjYTUzNWMwYzg2OWQyOTIyMDQxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgS3VsZXNob3YgPGt1bGVzaG92bWFpbEBnbWFp bC5jb20+CkRhdGU6IFRodSwgMjEgSnVsIDIwMTYgMTg6NDI6NDggKzA2MDAKU3ViamVjdDogW1BB VENIXSB2Yy1naXQ6IHByZXZlbnQgZXhlY3V0aW9uIG9mIGdpdCBzdGFzaCBpbiBlcnJvciBjYXNl cwoKKiBsaXNwL3ZjL3ZjLWdpdC5lbCAodmMtZ2l0LXN0YXNoLXNob3cpOiBwcmV2ZW50IGV4ZWN1 dGlvbiBpZiBzdGFzaApuYW1lIGlzIGVtcHR5IG9yIGEgcmVwbyBoYXNuJ3Qgc3Rhc2hlcy4KLS0t CiBsaXNwL3ZjL3ZjLWdpdC5lbCB8IDE2ICsrKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAxMCBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvdmMv dmMtZ2l0LmVsIGIvbGlzcC92Yy92Yy1naXQuZWwKaW5kZXggZTZmZTAxOS4uOTQwNzM4ZCAxMDA2 NDQKLS0tIGEvbGlzcC92Yy92Yy1naXQuZWwKKysrIGIvbGlzcC92Yy92Yy1naXQuZWwKQEAgLTEz NDgsMTIgKzEzNDgsMTYgQEAgdmMtZ2l0LXN0YXNoCiAoZGVmdW4gdmMtZ2l0LXN0YXNoLXNob3cg KG5hbWUpCiAgICJTaG93IHRoZSBjb250ZW50cyBvZiBzdGFzaCBOQU1FLiIKICAgKGludGVyYWN0 aXZlICJzU3Rhc2ggbmFtZTogIikKLSAgKHZjLXNldHVwLWJ1ZmZlciAiKnZjLWdpdC1zdGFzaCoi KQotICAodmMtZ2l0LWNvbW1hbmQgIip2Yy1naXQtc3Rhc2gqIiAnYXN5bmMgbmlsICJzdGFzaCIg InNob3ciICItcCIgbmFtZSkKLSAgKHNldC1idWZmZXIgIip2Yy1naXQtc3Rhc2gqIikKLSAgKGRp ZmYtbW9kZSkKLSAgKHNldHEgYnVmZmVyLXJlYWQtb25seSB0KQotICAocG9wLXRvLWJ1ZmZlciAo Y3VycmVudC1idWZmZXIpKSkKKyAgKGlmIChzdHJpbmc9IG5hbWUgIiIpCisgICAgICAoZXJyb3Ig InN0YXNoIG5hbWUgY2FuJ3QgYmUgZW1wdHkgc3RyaW5nLiIpKQorICAoaWYgKGVxICh2Yy1naXQt c3Rhc2gtbGlzdCkgbmlsKQorICAgICAgKGVycm9yICJUaGVyZSBhcmUgbm8gc3Rhc2hlcy4iKQor ICAgICh2Yy1zZXR1cC1idWZmZXIgIip2Yy1naXQtc3Rhc2gqIikKKyAgICAodmMtZ2l0LWNvbW1h bmQgIip2Yy1naXQtc3Rhc2gqIiAnYXN5bmMgbmlsICJzdGFzaCIgInNob3ciICItcCIgbmFtZSkK KyAgICAoc2V0LWJ1ZmZlciAiKnZjLWdpdC1zdGFzaCoiKQorICAgIChkaWZmLW1vZGUpCisgICAg KHNldHEgYnVmZmVyLXJlYWQtb25seSB0KQorICAgIChwb3AtdG8tYnVmZmVyIChjdXJyZW50LWJ1 ZmZlcikpKSkKIAogKGRlZnVuIHZjLWdpdC1zdGFzaC1hcHBseSAobmFtZSkKICAgIkFwcGx5IHN0 YXNoIE5BTUUuIgotLSAKMi44LjAucmMzLjEzNTMuZ2VhOWJkYzAKCg== --001a114035e27ac7b9053824b590--