gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added `magit-remote-branch-name'. Fixed unpushed args.

Browse source
This commit is contained in:
Phil Jackson 2010-07-05 23:53:22 +01:00
parent 82883d1de3
commit e58b3c379c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
magit.el
View file

@ -2518,6 +2518,12 @@ insert a line to tell how to insert more of them"
(or magit-marked-commit (or magit-marked-commit
(error "No commit marked"))) (error "No commit marked")))
(defun magit-remote-branch-name (remote branch)
"Get the name of the branch BRANCH on remote REMOTE"
(if (string= remote ".")
branch
(concat remote "/" branch)))
(magit-define-inserter unpulled-commits (remote branch) (magit-define-inserter unpulled-commits (remote branch)
(when remote (when remote
(magit-git-section 'unpulled (magit-git-section 'unpulled
@ -2531,7 +2537,7 @@ insert a line to tell how to insert more of them"
(magit-git-section 'unpushed (magit-git-section 'unpushed
"Unpushed commits:" 'magit-wash-log "Unpushed commits:" 'magit-wash-log
"log" "--pretty=format:* %H %s" "log" "--pretty=format:* %H %s"
(format "HEAD..%s" (format "%s..HEAD"
(magit-remote-branch-name remote branch))))) (magit-remote-branch-name remote branch)))))
(defun magit-remote-branch-for (local-branch) (defun magit-remote-branch-for (local-branch)