emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/gited d5de2d4 42/73: * gited.el (gited-do-sync-with-tru


From: Stefan Monnier
Subject: [elpa] externals/gited d5de2d4 42/73: * gited.el (gited-do-sync-with-trunk): Go to branch before `gited-sync-with-trunk'.
Date: Sun, 29 Nov 2020 00:00:36 -0500 (EST)

branch: externals/gited
commit d5de2d49e9dac105fc671c2e45fae38cf423ed00
Author: Tino Calancha <tino.calancha@gmail.com>
Commit: Tino Calancha <tino.calancha@gmail.com>

    * gited.el (gited-do-sync-with-trunk): Go to branch before 
`gited-sync-with-trunk'.
---
 gited.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gited.el b/gited.el
index e84e33b..4e1b891 100644
--- a/gited.el
+++ b/gited.el
@@ -2221,6 +2221,7 @@ tracking a remote repository"))
       (message "Successfully applied and committed %d commits!"
                num-commits))))
 
+;; FIXME: This command changes the current branch.  Should be preserved?
 (defun gited-do-sync-with-trunk (&optional dont-ask)
   "Run `gited-sync-with-trunk' in the marked branches.
 If optional arg DONT-ASK is non-nil, then do not prompt user for the
@@ -2237,6 +2238,7 @@ Called interactively with a prefix set DONT-ASK to 
non-nil."
               (completing-read
                prompt (gited-listed-branches)
                nil nil def))))
+      (gited-goto-branch br)
       (gited-sync-with-trunk target)))
   (gited-update))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]