From 094fbbf96415323907e71ec224a0f5d6e585d9d0 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 28 Feb 2008 01:28:45 -0500 Subject: git-gui: Paper bag fix info dialog when no files are staged at commit If the user tries to commit their changes without actually staging anything we used to display an informational dialog suggesting they first stage those changes, then retry the commit feature. Unfortunately I broke this in aba15f7 ("Ensure error dialogs always appear over all other windows") and failed to fix it in the paper bag fix that came one day after it. Signed-off-by: Shawn O. Pearce --- lib/error.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/error.tcl b/lib/error.tcl index 08a24622c7..8c27678e3a 100644 --- a/lib/error.tcl +++ b/lib/error.tcl @@ -47,7 +47,7 @@ proc info_popup {msg} { append title " ([reponame])" } tk_messageBox \ - -parent $parent \ + -parent [_error_parent] \ -icon info \ -type ok \ -title $title \ -- cgit v1.2.3 From a1eebfb3a90b6c240afd1a32cfebe6ee5dbd72c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Vanicat?= Date: Fri, 29 Feb 2008 19:28:19 +0100 Subject: git.el: find the git-status buffer whatever its name is MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-status used the buffer name to find git-status buffers, and that can fail if the buffer has another name, for example when multiple working directories is tracked. Signed-off-by: Rémi Vanicat Acked-by: Alexandre Julliard Tested-by: Xavier Maillard Signed-off-by: Junio C Hamano --- contrib/emacs/git.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index d8a06381f4..0312d891fd 100644 --- a/contrib/emacs/git.el +++ b/contrib/emacs/git.el @@ -1432,7 +1432,7 @@ Commands: (with-current-buffer buffer (when (and list-buffers-directory (string-equal fulldir (expand-file-name list-buffers-directory)) - (string-match "\\*git-status\\*$" (buffer-name buffer))) + (eq major-mode 'git-status-mode)) (setq found buffer)))) (setq list (cdr list))) found)) -- cgit v1.2.3 From 84989bd820119260c4fcd0dd5ee8a50bc8ff0d2c Mon Sep 17 00:00:00 2001 From: Mike Ralphson Date: Fri, 29 Feb 2008 17:00:38 +0000 Subject: Documentation cherry-pick: Fix cut-and-paste error Signed-off-by: Mike Ralphson Signed-off-by: Junio C Hamano --- Documentation/git-cherry-pick.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 877ab66ef5..f0beb412e6 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -45,7 +45,7 @@ OPTIONS default is not to do `-x` so this option is a no-op. -m parent-number|--mainline parent-number:: - Usually you cannot revert a merge because you do not know which + Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change -- cgit v1.2.3