Re: [PATCH] gitk: Enable mouse horizontal scrolling in diff pane

2014-11-16 Thread Stefan Haller
Gabriele Mazzotta wrote: > Currently it's required to hold Shift and scroll up and down to move > horizontally. Listen to Button-6 and Button-7 events too to make > horizontal scrolling handier with touchpads and some mice. Hm, on my Macbook the diff pane already scrolls in all four directions w

Re: [PATCH v2 2/2] config: clear the executable bits (if any) on $GIT_DIR/config

2014-11-16 Thread Johannes Sixt
Am 16.11.2014 um 08:21 schrieb Michael Haggerty: > @@ -559,9 +562,21 @@ int cmd_config(int argc, const char **argv, const char > *prefix) > if (given_config_source.blob) > die("editing blobs is not supported"); > git_config(git_default_config, NULL

Re: [PATCH] difftool: honor --trust-exit-code for builtin tools

2014-11-16 Thread Andreas Schwab
David Aguilar writes: > run_merge_tool() was not setting $status, which prevented the > exit code for builtin tools from being forwarded to the caller. > > Capture the exit status and add a test to guarantee the behavior. > > Reported-by: Adria Farres <14farr...@gmail.com> > Signed-off-by: David

Re: [PATCH/RFC v2 1/2] submodule: add ability to shallowly clone any branch in a repo as a submodule

2014-11-16 Thread Yoni Tsafir
Was this accepted? I am also interested at this behavior or some kind of other solution to git submodule --depth combined with a branch. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kern

How safe are signed git tags? Only as safe as SHA-1 or somehow safer?

2014-11-16 Thread Patrick Schleizer
Hi! How safe are signed git tags? Especially because git uses SHA-1. There is contradictory information around. So if one verifies a git tag (`git tag -v tagname`), then `checksout`s the tag, and checks that `git status` reports no untracked/modified files, without further manually auditing the c

[PATCH] l10n: de.po: translate 2 new messages

2014-11-16 Thread Phillip Sz
Phillip Signed-off-by: Phillip Sz --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index c807967..5af3f8f 100644 --- a/po/de.po +++ b/po/de.po @@ -5473,7 +5473,7 @@ msgstr "prüft die Reflogs (Standard)" #: builtin/fsck.c:613 msgid "also

Re: [PATCH] difftool: honor --trust-exit-code for builtin tools

2014-11-16 Thread Junio C Hamano
Mikael Magnusson writes: >>> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh >>> index a40d3df..2b66351 100644 >>> --- a/git-mergetool--lib.sh >>> +++ b/git-mergetool--lib.sh >>> @@ -221,6 +221,7 @@ run_merge_tool () { >>> else >>> run_diff_cmd "$1" >>> fi >>>

Re: [PATCH] Introduce a hook to run after formatting patches

2014-11-16 Thread Junio C Hamano
Stefan Beller writes: > +post-format-patch > + > + > +This hook is called after format-patch created a patch and it is > +invoked with the filename of the patch as the first parameter. Such an interface would not work well with --stdout mode, would it? And if this only works with o

Re: [PATCH 2/2] config: clear the executable bits (if any) on $GIT_DIR/config

2014-11-16 Thread Junio C Hamano
Michael Haggerty writes: > There is no reason for $GIT_DIR/config to be executable, plus this > change will help clean up repositories affected by the bug that was > fixed by the previous commit. I do not think we want to do this. It is a welcome bugfix to create $GIT_DIR/config without executa

Re: [PATCH] replace: fix replacing object with itself

2014-11-16 Thread Junio C Hamano
Christian Couder writes: >> The patch is not wrong per-se, but I wonder how useful this "do not >> replace itself but all other forms of loops are not checked at all" >> would be in practice. If your user did this: >> >> git replace A B ;# pretend as if what is in B is in A >> gi

Re: [PATCH v2 1/2] create_default_files(): don't set u+x bit on $GIT_DIR/config

2014-11-16 Thread Junio C Hamano
Michael Haggerty writes: > Since time immemorial, the test of whether to set "core.filemode" has > been done by trying to toggle the u+x bit on $GIT_DIR/config and then > testing whether the change "took". It is somewhat odd to use the > config file for this test, but whatever. The last sentence

[PATCH v2] Windows: correct detection of EISDIR in mingw_open()

2014-11-16 Thread Johannes Sixt
According to the Linux open(2) man page, open() returns EISDIR if a directory was attempted to be opened for writing. Our emulation in mingw_open() does not get this right: it checks only for O_CREAT. Fix it to check for a write request. This fixes a failure in reflog handling, which opens files w

Re: [PATCH/RFC] builtin: move builtin retrieval to get_builtin()

2014-11-16 Thread Slavomir Vlcek
On 11/13/2014 07:19 PM, Junio C Hamano wrote: >> git.c | 27 +++ >> 1 file changed, 15 insertions(+), 12 deletions(-) >> >> diff --git a/git.c b/git.c >> index 18fbf79..e32c5b8 100644 >> --- a/git.c >> +++ b/git.c >> @@ -487,15 +487,20 @@ static struct cmd_struct commands[]

Re: Fwd: Add git ignore as builtin

2014-11-16 Thread Ryan Jacobs
Alberto Fanjul Alonso gmail.com> writes: > git ignore adds to .git/info/exclude This should be "git exclude" not "git ignore". Difference between the two: http://stackoverflow.com/questions/10066749/git- excludes-vs-ignores I'd second the notion of a "git ignore", however it would have to mo

[PATCH] apply: fix typo in an error message

2014-11-16 Thread Slavomir Vlcek
s/submoule/submodule Signed-off-by: Slavomir Vlcek --- For the 'master'. Thank you. builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/apply.c b/builtin/apply.c index 6696ea4..28d24f8 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3728,7 +3728,7

[PATCH] Documentation: change "gitlink" typo in git-push

2014-11-16 Thread brian m. carlson
The git-push manual page used "gitlink" in one place instead of "linkgit". Fix this so the link renders correctly. Noticed-by: Dan Allen Signed-off-by: brian m. carlson --- Documentation/git-push.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-push.txt

Re: [PATCH v2 1/2] create_default_files(): don't set u+x bit on $GIT_DIR/config

2014-11-16 Thread Eric Sunshine
On Sun, Nov 16, 2014 at 2:21 AM, Michael Haggerty wrote: > Since time immemorial, the test of whether to set "core.filemode" has > been done by trying to toggle the u+x bit on $GIT_DIR/config and then > testing whether the change "took". It is somewhat odd to use the > config file for this test, b