git-gui resets author on amend

Hi, Amending a commit using git gui resets its author, unlike plain git commit --amend. - Orgad -- 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.kernel.org/majordomo-info.html

[PATCH] submodule: add verbose mode for add/update

Executes checkout without -q --- git-submodule.sh | 24 +++- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index a33f68d..5c4e057 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -5,11 +5,11 @@ # Copyright (c) 2007

[PATCH] submodule: add verbose mode for add/update

From: Orgad Shaneh org...@gmail.com Executes checkout without -q Signed-off-by: Orgad Shaneh org...@gmail.com --- Documentation/git-submodule.txt | 7 +-- git-submodule.sh| 24 +++- t/t7406-submodule-update.sh | 9 + 3 files changed, 33

Re: [PATCH] submodule: add verbose mode for add/update

On Wed, Mar 12, 2014 at 6:15 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 12.03.2014 14:42, schrieb Orgad Shaneh: From: Orgad Shaneh org...@gmail.com You don't need the line above when you are the sender ;-) Executes checkout without -q That's a bit terse. What about: Add

[PATCH] git-submodule: respect -q for add/update

Signed-off-by: Orgad Shaneh org...@gmail.com --- git-submodule.sh | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index aac575e..dd57abb 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -266,6 +266,11 @@ cmd_add

[PATCH] Fix path normalization for SMB shares

SMB shared are accessed using //server/share/directory... notation. normalize_path_copy used to leave only a single slash, which invalidated the path. Fix suggested by Nguyen Thai Ngoc Duy Signed-off-by: Orgad Shaneh org...@gmail.com --- path.c |6 ++ 1 file changed, 6 insertions

[PATCH] commit: configure submodules

As reported on the mailing list[1], ignore submodule config is not respected on commit. [1] http://git.661346.n2.nabble.com/submodule-ignore-is-not-respected-on-commit-td7539238.html Signed-off-by: Orgad Shaneh org...@gmail.com --- builtin/commit.c |1 + 1 file changed, 1 insertion

Re: [PATCH] commit: configure submodules

out yet). -- 8 -- From: Orgad Shaneh org...@gmail.com Date: Sun, 23 Sep 2012 09:37:47 +0200 Subject: [PATCH] commit: pay attention to submodule.$name.ignore in .gitmodules git status does not list a submodule with uncommitted working tree files as modified when submodule.$name.ignore

Re: [PATCH] commit: configure submodules

On Mon, Sep 24, 2012 at 9:06 PM, Junio C Hamano gits...@pobox.com wrote: Orgad Shaneh org...@gmail.com writes: That is not correct. git-config is ignored as well for commit. What do you mean? As far as I can tell, if you have [submodule var] path = var ignore = dirty

[PATCH] submodule: configure submodule.name.path on add and init

In order to read diff options for a submodule, its path must be configured --- git-submodule.sh |2 ++ 1 file changed, 2 insertions(+) diff --git a/git-submodule.sh b/git-submodule.sh index 3e2045e..f97bb62 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -359,6 +359,7 @@ Use -f if

Re: [PATCH] submodule: configure submodule.name.path on add and init

On Mon, Sep 24, 2012 at 9:30 PM, Orgad Shaneh org...@gmail.com wrote: In order to read diff options for a submodule, its path must be configured --- git-submodule.sh |2 ++ 1 file changed, 2 insertions(+) diff --git a/git-submodule.sh b/git-submodule.sh index 3e2045e..f97bb62 100755

Re: [PATCH] commit: configure submodules

On Mon, Sep 24, 2012 at 9:56 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 24.09.2012 21:16, schrieb Orgad Shaneh: On Mon, Sep 24, 2012 at 9:06 PM, Junio C Hamano gits...@pobox.com wrote: Orgad Shaneh org...@gmail.com writes: That is not correct. git-config is ignored as well for commit

git gui replaces amend message when prepare-commit-msg hook is used

Hi, If a prepare-commit-msg hook is used, git gui executes it for New Commit. If the New Commit is selected, and then immediately Amend (before the hook returns), when the hook returns the message is replaced with the one produced by the hook. - Orgad -- To unsubscribe from this list: send the

Re: git gui replaces amend message when prepare-commit-msg hook is used

On Thu, Jul 4, 2013 at 1:01 PM, Fredrik Gustafsson iv...@iveqy.com wrote: On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote: If a prepare-commit-msg hook is used, git gui executes it for New Commit. If the New Commit is selected, and then immediately Amend (before the hook returns

Re: git gui replaces amend message when prepare-commit-msg hook is used

On Thu, Jul 4, 2013 at 1:34 PM, John Keeping j...@keeping.me.uk wrote: On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote: Hi, If a prepare-commit-msg hook is used, git gui executes it for New Commit. If the New Commit is selected, and then immediately Amend (before the hook

Re: git gui replaces amend message when prepare-commit-msg hook is used

On Thu, Jul 4, 2013 at 2:19 PM, John Keeping j...@keeping.me.uk wrote: On Thu, Jul 04, 2013 at 01:59:10PM +0300, Orgad Shaneh wrote: On Thu, Jul 4, 2013 at 1:34 PM, John Keeping j...@keeping.me.uk wrote: On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote: Hi, If a prepare

Re: git gui replaces amend message when prepare-commit-msg hook is used

On Thu, Jul 4, 2013 at 3:42 PM, Antoine Pelisse apeli...@gmail.com wrote: Your problem is that your hook script is not checking $2 so it is overwriting the message even when you do not want to do so. No, it isn't. Not by git-gui at least. Check /tmp/hook.log with the hook I provided... So

Re: relative objects/info/alternates doesn't work on remote SMB repo

On Thu, Aug 30, 2012 at 3:34 PM, Orgad and Raizel Shaneh org...@gmail.com wrote: On Thu, Aug 30, 2012 at 4:22 PM, Nguyen Thai Ngoc Duy pclo...@gmail.com wrote: On Thu, Aug 30, 2012 at 8:12 PM, Orgad and Raizel Shaneh org...@gmail.com wrote: Could be path normalization. What does git

[PATCH] gitweb: fix error when highlight is enabled

Use of uninitialized value in substitution iterator at gitweb.cgi line 1560 Signed-off-by: Orgad Shaneh org...@gmail.com --- gitweb/gitweb.perl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 0f207f2..862b9cd 100755

[PATCH] gitweb: fix error in sanitize when highlight is enabled

$1 becomes undef by internal regex, since it has no capture groups. Match against accpetable control characters using index() instead of a regex. Signed-off-by: Orgad Shaneh org...@gmail.com --- gitweb/gitweb.perl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb

Re: rev-parse fails on objects that contain colon

On Sun, Feb 17, 2013 at 10:37 AM, Orgad Shaneh org...@gmail.com wrote: $ git stash save foo:bar HEAD is now at 9f88dce Foo $ git stash pop foo:bar fatal: Invalid object name 'foo'. $ git rev-parse foo:bar foo:bar fatal: Invalid object name 'foo'. Tested on Windows (msysGit) and Linux

[PATCH] rebase: use -f for checkout

If a file's case is changed on rename (Foo - foo), rebase fails on Windows because the file already exists. The change is safe, because if working directory is not clean rebase fails before checking out. --- git-rebase.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH] submodule: add verbose mode for add/update

Executes checkout without -q --- git-submodule.sh | 24 +++- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 79bfaac..f7964ad 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -5,11 +5,11 @@ # Copyright (c) 2007

[PATCH] submodule: add verbose mode for add/update

to checkout so the user sees progress output from the checkout command. Signed-off-by: Orgad Shaneh org...@gmail.com --- Documentation/git-submodule.txt | 10 -- git-submodule.sh| 24 +++- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git

Fwd: [PATCH] submodule: add verbose mode for add/update

On Wed, Apr 10, 2013 at 11:00 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 10.04.2013 20:24, schrieb Orgad Shaneh: Executes checkout without -q Nice, looks like you picked the proposal I made last September: http://permalink.gmane.org/gmane.comp.version-control.git/204747 Took me

Re: [PATCH] git-gui: Do not reset author details on amend

o take > this over. > > Thanks. > > Orgad Shaneh <org...@gmail.com> writes: > >> git commit --amend preserves the author details unless --reset-author is >> given. >> >> git-gui discards the author details on amend. >> >> Fix by reading th

[PATCH] git-gui: Do not reset author details on amend

in the mailing list[1]. [1] http://article.gmane.org/gmane.comp.version-control.git/243921 Signed-off-by: Orgad Shaneh <org...@gmail.com> --- git-gui/lib/commit.tcl | 19 +++ 1 file changed, 19 insertions(+) diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index 8

[PATCH] merge: Run commit-msg hook

From: Orgad Shaneh <org...@gmail.com> commit-msg is needed to either validate the commit message or edit it. Gerrit for instance uses this hook to append its Change-Id footer. This is relevant to merge commit just like any other commit. Signed-off-by: Orgad Shaneh <org...@

[PATCH] commit: Fix description of no-verify

From: Orgad Shaneh <org...@gmail.com> include also commit-msg hook. Signed-off-by: Orgad Shaneh <org...@gmail.com> --- builtin/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/commit.c b/builtin/commit.c index 163dbca..2725712 100644 --- a/buil

Re: [PATCH] merge: Run commit-msg hook

Hi, On Tue, Jul 26, 2016 at 4:02 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Orgad, > > On Tue, 26 Jul 2016, Orgad Shaneh wrote: > >> From: Orgad Shaneh <org...@gmail.com> > > Again, this is unnecessary if you already send the mail from

Re: [PATCH] commit: Fix description of no-verify

Hi and thanks for your reply. On Tue, Jul 26, 2016 at 3:55 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Orgad > > On Tue, 26 Jul 2016, Orgad Shaneh wrote: > >> From: Orgad Shaneh <org...@gmail.com> > > This is unnecessary, as it matches y

[PATCH] merge: Run commit-msg hook

Hi again, On Tue, Jul 26, 2016 at 5:54 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > > Hi Orgad, > > On Tue, 26 Jul 2016, Orgad Shaneh wrote: > > > On Tue, Jul 26, 2016 at 4:02 PM, Johannes Schindelin > > <johannes.schinde...@gmx.de> wrote:

Re: [PATCH] git-gui: Do not reset author details on amend

It's been over 2 months. Can anyone please review and merge it? Thanks. - Orgad On Wed, May 18, 2016 at 9:12 AM, Orgad Shaneh <org...@gmail.com> wrote: > ping? > > On Thu, May 5, 2016 at 8:22 PM, Junio C Hamano <gits...@pobox.com> wrote: >> Pat, we haven't hea

Re: [PATCH] git-gui: Do not reset author details on amend

4.5 months and counting... :( - Orgad On Sun, Jul 10, 2016 at 7:36 AM, Orgad Shaneh <org...@gmail.com> wrote: > It's been over 2 months. Can anyone please review and merge it? > > Thanks. > - Orgad > > On Wed, May 18, 2016 at 9:12 AM, Orgad Shaneh <org...@gmail.com>

Re: [PATCH] git-gui: Do not reset author details on amend

On Tue, Sep 27, 2016 at 7:31 PM, Junio C Hamano <gits...@pobox.com> wrote: > Orgad Shaneh <org...@gmail.com> writes: > >> On Tue, Sep 27, 2016 at 12:34 AM, Junio C Hamano <gits...@pobox.com> wrote: >>> Orgad Shaneh <org...@gmail.com> writes:

Re: [PATCH] git-gui: Do not reset author details on amend

On Tue, Sep 27, 2016 at 12:34 AM, Junio C Hamano <gits...@pobox.com> wrote: > Orgad Shaneh <org...@gmail.com> writes: > >> On Sun, Jul 10, 2016 at 7:36 AM, Orgad Shaneh <org...@gmail.com> wrote: >> >>> On Wed, May 18, 2016 at 9:12 AM, Orgad Shaneh <o

recursive grep doesn't respect --color=always inside submodules

Hi, When git grep --color=always is used, and the output is redirected to a file or a pipe, results inside submodules are not colored. Results in the supermodule are colored correctly. - Orgad

fetch-any-blob / ref-in-want proposal

Hi, Jonathan Tan proposed a design and a patch series for requesting a specific ref on fetch 4 months ago[1]. Is there any progress with this? - Orgad [1] https://public-inbox.org/git/ffd92ad9-39fe-c76b-178d-6e3d6a425...@google.com/

Re: fetch-any-blob / ref-in-want proposal

On Mon, Jul 24, 2017 at 7:13 PM, Jonathan Tan <jonathanta...@google.com> wrote: > On Sun, 23 Jul 2017 09:41:50 +0300 > Orgad Shaneh <org...@gmail.com> wrote: > >> Hi, >> >> Jonathan Tan proposed a design and a patch series for requesting a

Submodule/contents conflict

Hi, I've noticed a strange behavior with submodule/content conflict. My current Git version is 2.12.2, but the problem exists since I remember. Branch A has a submodule. In branch B which diverged from A, I replaced the submodule with its contents. Now, every time I merge A into B, and A had

bug with git add and .gitignore

Hi, When a not-ignored file inside an ignore directory is added along with other files, a false alarm is shown: git init echo /d/ > .gitignore mkdir d touch d/file foo git add -f d/file foo git add d/file # fine git add d/file foo # The following paths are ignored by one of your .gitignore

[PATCH] name-rev: Fix tag lookup on repository with mixed types of tags

Commit 7550424804 (name-rev: include taggerdate in considering the best name) introduced a bug in name-rev. If a repository has both annotated and non-annotated tags, annotated tag will always win, even if it was created decades after the commit. Consider a repository that always used

Getting first tag per branch for a commit

Hi, git describe --tags gives me the first tag that includes this commit. git tag --contains shows all the tags that contain the commit. git branch -a --contains shows the branches that include this commit. What I'd like to have is a way to tell the first tag per branch (or per merge) that

Re: Getting first tag per branch for a commit

On Mon, Jun 26, 2017 at 12:54 AM, Junio C Hamano <gits...@pobox.com> wrote: > Orgad Shaneh <org...@gmail.com> writes: > >> What I'd like to have is a way to tell the first tag per branch (or >> per merge) that the commit appeared on. > >> I think that

Out of memory with diff.colormoved enabled

Hi, git version 2.15.0.rc0 (from debian sid package) There is an infinite loop when colormoved is used with --ignore-space-change: git init seq 20 > test git add test sed -i 's/9/42/' test git -c diff.colormoved diff --ignore-space-change -- test - Orgad

Lightweight tags are still not considered on git describe --contains

Hi, There was an issue with lightweight tags that was supposed to be fixed in Git 2.14 (by branch jc/name-rev-lw-tag). I also proposed a patch[1], but that was too late, after the other fix was already in master. Anyway, I still have the same issue with git 2.14.2.windows.3. My repository has

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

On Fri, Nov 3, 2017 at 6:20 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Orgad, > > On Fri, 3 Nov 2017, Johannes Schindelin wrote: > >> On Thu, 2 Nov 2017, Orgad Shaneh wrote: >> >> > I can't reproduce this with a minimal example, but it h

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

On Sat, Nov 4, 2017 at 8:04 PM, Orgad Shaneh <org...@gmail.com> wrote: > On Fri, Nov 3, 2017 at 6:20 PM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: >> Hi Orgad, >> >> On Fri, 3 Nov 2017, Johannes Schindelin wrote: >> >>> On Thu

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

On Mon, Nov 6, 2017 at 8:37 PM, Brandon Williams wrote: > After reading your bug report and the fact that you weren't able to > reproduce it outside of your project I think i figured out what is > happening. Before ff6f1f564c the gitmodules file wasn't being loaded > unless a

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

On Thu, Nov 2, 2017 at 8:34 PM, Stefan Beller <sbel...@google.com> wrote: > On Thu, Nov 2, 2017 at 1:30 AM, Orgad Shaneh <org...@gmail.com> wrote: >> I can't reproduce this with a minimal example, but it happens in my project. >> >> What I tried to do for re

Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

I can't reproduce this with a minimal example, but it happens in my project. What I tried to do for reproducing is: rm -rf super sub mkdir sub; cd sub; git init git commit --allow-empty -m 'Initial commit' mkdir ../super; cd ../super git init git submodule add ../sub touch foo; git add foo sub

Re: [PATCH] checkout files in-place

On Tue, Jun 12, 2018 at 11:51 AM Edward Thomson wrote: > > On Tue, Jun 12, 2018 at 09:13:54AM +0300, Orgad Shaneh wrote: > > Some of my colleagues use an ancient version of Source Insight, which also > > locks files for write. > > If that application is locking files for

[PATCH] git-rebase--interactive: fix copy-paste mistake

exec argument is a command, not a commit. Signed-off-by: Orgad Shaneh <org...@gmail.com> --- git-rebase--interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index cbf44f8648..85a72b933e 100644 ---

Re: [PATCH] git-rebase--interactive: fix copy-paste mistake

On Mon, May 28, 2018 at 3:56 PM Johannes Schindelin < johannes.schinde...@gmx.de> wrote: > Hi Orgad, > On Sun, 27 May 2018, Orgad Shaneh wrote: > > exec argument is a command, not a commit. > > > > Signed-off-by: Orgad Shaneh <org...@gmail.com> > >

A bug in git merge

Hi, If I cherry-pick a commit that added a line, then merge another commit which removes this line, the line remains in the file instead of being removed. The following script demonstrates the bug. file should be equivalent on both branches git init seq 1 20 > file git add file git commit -m

grep issues

Hi, I found 2 bugs in grep, using Git for Windows 2.19.1 (but noticed these several versions ago): 1. git grep --recursive on a worktree (without rev) always matches against the submodule's HEAD, not its worktree, as it should. 2. When core.autocrlf (or eol=crlf) is used, and a file in the