Re: [PATCH] diff --no-index: allow pathspec after --

2014-09-21 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Coming back to the command line syntax for the new feature, if I had to choose, I would say git diff --no-index [-options] [--] path path pathspec perhaps? As we never compare anything other than two things,... Actually, I am not so sure

Re: [PATCH] l10n: de.po: change Email to E-Mail

2014-09-21 Thread Ralf Thielow
2014-09-20 17:51 GMT+02:00 Phillip Sz phillip.sze...@gmail.com: Changes all Email to E-Mail, as this is the correct form in german. Thanks! Phillip Signed-off-by: Phillip Sz phillip.sze...@gmail.com --- po/de.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff

[PATCH] remote: simplify match_name_with_pattern() using strbuf

2014-09-21 Thread René Scharfe
Make the code simpler and shorter by avoiding repetitive use of string length variables and leaving memory allocation to strbuf functions. Signed-off-by: Rene Scharfe l@web.de --- remote.c | 17 + 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/remote.c

Re: [RFC/PATCH] notes: Allow adding empty notes with -C

2014-09-21 Thread Torsten Bögershausen
On 2014-09-21 05.00, Johan Herland wrote: [] diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index cfd67ff..a6c399b 100755 --- a/t/t3301-notes.sh +++ b/t/t3301-notes.sh @@ -1239,4 +1239,23 @@ test_expect_success 'git notes get-ref (--ref)' ' test $(GIT_NOTES_REF=refs/notes/bar git

[PATCH] mailinfo: resolve -Wstring-plus-int warning

2014-09-21 Thread Eric Sunshine
The just-released Apple Xcode 6.0.1 has -Wstring-plus-int enabled by default which complains about pointer arithmetic applied to a string literal: builtin/mailinfo.c:303:24: warning: adding 'long' to a string does not append to the string return !memcmp(SAMPLE + (cp -

Re: [PATCH] diff --no-index: allow pathspec after --

2014-09-21 Thread Duy Nguyen
On Sun, Sep 21, 2014 at 1:19 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: Coming back to the command line syntax for the new feature, if I had to choose, I would say git diff --no-index [-options] [--] path path pathspec perhaps? As we never

Re: [RFC/PATCH] notes: Allow adding empty notes with -C

2014-09-21 Thread Johan Herland
On Sun, Sep 21, 2014 at 10:53 AM, Torsten Bögershausen tbo...@web.de wrote: On 2014-09-21 05.00, Johan Herland wrote: [...] +cat expect EOF Git style for shell scripts: Plase put no space between or or and the file name: cat expect EOF [...] + git log -1 actual git log -1

Re: [PATCH v2 22/32] checkout: support checking out into a new working directory

2014-09-21 Thread Duy Nguyen
On Sun, Sep 21, 2014 at 10:10 AM, Eric Sunshine sunsh...@sunshineco.com wrote: Would it make sense for this rule of thumb summary to be presented first, and then the explanation of that rule after, rather than the reverse as is currently the case? You mean like this? diff --git

[PATCH] sha1_file: don't convert off_t to size_t too early to avoid potential die()

2014-09-21 Thread Steffen Prohaska
xsize_t() checks if an off_t argument can be safely converted to a size_t return value. If the check is executed too early, it could fail for large files on 32-bit architectures even if the size_t code path is not taken. Other paths might be able to handle the large file. Specifically,

Re: [PATCH v2 23/32] prune: strategies for linked checkouts

2014-09-21 Thread Duy Nguyen
Here we go again. Thanks both for the suggestions. -- 8 -- Subject: [PATCH] prune: strategies for linked checkouts (alias R=$GIT_COMMON_DIR/worktrees/id) - linked checkouts are supposed to keep its location in $R/gitdir up to date. The use case is auto fixup after a manual checkout move.

Re: [PATCH v2 28/32] gc: support prune --worktrees

2014-09-21 Thread Duy Nguyen
And this is the update as suggested in 23/32 [1] [1] http://thread.gmane.org/gmane.comp.version-control.git/256210/focus=256849 -- 8 -- Subject: [PATCH] gc: support prune --worktrees Helped-by: Marc Branchaud marcn...@xiplink.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com ---

[PATCH] t9300-fast-import: fix typo in test description

2014-09-21 Thread Stefan Beller
Signed-off-by: Stefan Beller stefanbel...@gmail.com --- t/t9300-fast-import.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 8a05449..8df0445 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2866,7

Re: [PATCH v2 23/23] rebase -i: enable options --signoff, --reset-author for pick, reword

2014-09-21 Thread Fabian Ruch
Hi Michael, On 08/13/2014 02:47 PM, Michael Haggerty wrote: On 08/07/2014 01:59 AM, Fabian Ruch wrote: pick and reword are atomic to-do list commands in the sense that they open a new task which is closed after the respective command is completed. squash and fixup are not atomic. They create

[Bug] git status -unormal -- 'foo[b]/' won't display content of 'foo[b]/

2014-09-21 Thread Rémi Vanicat
Hello, I found what look like a bug in git status: `git status -unormal foo[b]/` won't output the content of the directory foo[b] when `git status -unormal foo/` will output the content of the directory foo: $ mkdir 'foo[b]' $ touch 'foo[b]/bar' $ git status -unormal 'foo[b]/' On branch

Re: [Bug] git status -unormal -- 'foo[b]/' won't display content of 'foo[b]/

2014-09-21 Thread Torsten Bögershausen
On 2014-09-21 20.04, Rémi Vanicat wrote: Hello, I found what look like a bug in git status: `git status -unormal foo[b]/` won't output the content of the directory foo[b] when `git status -unormal foo/` will output the content of the directory foo: $ mkdir 'foo[b]' $ touch

[PATCH] t6031-test-merge-recursive: Forgot to add file to be committed

2014-09-21 Thread Stefan Beller
Signed-off-by: Stefan Beller stefanbel...@gmail.com --- t/t6031-merge-recursive.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index a953f1b..6464a16 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -13,6

[PATCH] merge-recursive: Fix copy-paste mistake

2014-09-21 Thread Stefan Beller
The following issue was found by scan.coverity.com (ID: 1049510), and claimed to be likely a copy-paste mistake. Introduced in 331a1838b (2010-07-02, Try normalizing files to avoid delete/modify conflicts when merging), which is quite a long time ago, so I'm rather unsure if it's of any impact or

Re: diff-index does not consider a removed submodule to be staged with --ignore-submodules

2014-09-21 Thread Jens Lehmann
Am 20.09.2014 um 18:20 schrieb Daniel Hahler: After staging the removal of a submodule, diff-index does not consider this when --ignore-submodules is being used: # In a repository with submodule sm: % git rm --cached sm % git diff-index --cached --quiet --ignore-submodules HEAD

Re: Bug/request: the empty string should be a valid git note

2014-09-21 Thread Kyle J. McKay
On Sep 20, 2014, at 18:44, Johan Herland wrote: At least, we should fix git notes add -C e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 Whether we should also change git notes add -m '' to create an empty note, or leave it as-is, (i.e. similar in spirit to git commit -m ''), I'll leave up

Re: [Bug] git status -unormal -- 'foo[b]/' won't display content of 'foo[b]/

2014-09-21 Thread Duy Nguyen
On Mon, Sep 22, 2014 at 2:52 AM, Torsten Bögershausen tbo...@web.de wrote: git status takes a pathspec as a parameter, which is not the same as a filename. A pathspec can contain wildcards like '*' or '?' or things like *[ch]. This is known as shell glob syntax (or so), and used automatically

Hello,

2014-09-21 Thread salvador . reyes
Hello, I am pleased to contact you after viewing your profile i am interested in having communication with you and if possible to be your friend, please dear write me back using my e-mail address(devineadam...@yahoo.com) i am waiting to hear from you soon. yours new friend Divine. -- To