Bug in fetch-pack.c, please confirm

2015-03-15 Thread Kyle J. McKay
Hi guys, So I was looking at fetch-pack.c (from master @ 52cae643, but I think it's the same everywhere): # Lines 626-648 for (retval = 1, ref = *refs; ref ; ref = ref-next) { const unsigned char *remote = ref-old_sha1; unsigned char local[20];

Re: fatal: Unable to mark file .ruby-version

2015-03-15 Thread t . gummerer
Hi, On 03/15, Arup Rakshit wrote: Hi, I am trying to ignore 2 files, but getting error - [arup@sztukajedzenia (SJ002)]$ git status # On branch SJ002 # Untracked files: # (use git add file... to include in what will be committed) # # .ruby-gemset # .ruby-version nothing

Re: fatal: Unable to mark file .ruby-version

2015-03-15 Thread Arup Rakshit
On Sunday, March 15, 2015 01:30:04 PM you wrote: Hi, On 03/15, Arup Rakshit wrote: Hi, I am trying to ignore 2 files, but getting error - [arup@sztukajedzenia (SJ002)]$ git status # On branch SJ002 # Untracked files: # (use git add file... to include in what will be

[PATCH RFC 1/3] add: add new --exclude option to git add

2015-03-15 Thread Alexander Kuleshov
This patch introduces new --exclude option for the git add command. We already have core.excludesfile configuration variable which indicates a path to file which contains patterns to exclude. This patch provides ability to pass --exclude option to the git add command to exclude paths from command

[PATCH 3/3] t3700-add: added test for --exclude option

2015-03-15 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- t/t3700-add.sh | 7 +++ 1 file changed, 7 insertions(+) diff --git a/t/t3700-add.sh b/t/t3700-add.sh index f7ff1f5..c52a5d0 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -81,6 +81,13 @@ test_expect_success '.gitignore is

[PATCH 2/3] Documentation/git-add.txt: describe --exclude option

2015-03-15 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- Documentation/git-add.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index f2eb907..4bc156a 100644 --- a/Documentation/git-add.txt +++

[PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-15 Thread Yurii Shevtsov
Changes 'git diff --no-index $directory $file' behaviour. Now it is transformed to 'git diff --no-index $directory/file $file' instead of throwing an error. Signed-off-by: Yurii Shevtsov ungetch at gmail.com --- diff-no-index.c | 21 +++-- 1 files changed, 19 insertions(+), 2

fatal: Unable to mark file .ruby-version

2015-03-15 Thread Arup Rakshit
Hi, I am trying to ignore 2 files, but getting error - [arup@sztukajedzenia (SJ002)]$ git status # On branch SJ002 # Untracked files: # (use git add file... to include in what will be committed) # # .ruby-gemset # .ruby-version nothing added to commit but untracked files present

Re: Bug in fetch-pack.c, please confirm

2015-03-15 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Kyle J. McKay mack...@gmail.com writes: Hi guys, So I was looking at fetch-pack.c (from master @ 52cae643, but I think it's the same everywhere): ... -hashcpy(ref-new_sha1, local); +hashcpy(ref-new_sha1, o-sha1);

Re: [PATCH 2/2] diff-files: mark i-t-a paths as new

2015-03-15 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c | 1 + diff-lib.c| 5 + 2 files changed, 6 insertions(+) diff --git a/builtin/add.c b/builtin/add.c index 3390933..ee370b0 100644 --- a/builtin/add.c +++

Re: Promoting Git developers

2015-03-15 Thread Christian Couder
On Thu, Mar 12, 2015 at 11:58 PM, Junio C Hamano gits...@pobox.com wrote: Jeff King p...@peff.net writes: Seeing my name in shortlog was nice, but not that exciting. I submitted a patch, it was taken, and of course it ends up in any automated lists of authors. What was much more rewarding was

Re: Bug in fetch-pack.c, please confirm

2015-03-15 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: Hi guys, So I was looking at fetch-pack.c (from master @ 52cae643, but I think it's the same everywhere): # Lines 626-648 49bb805e (Do not ask for objects known to be complete., 2005-10-19) seems to lose the assignment to local[]. Something's

Re: Promoting Git developers

2015-03-15 Thread Christian Couder
On Wed, Mar 11, 2015 at 9:42 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: On Tue, Mar 10, 2015 at 6:23 PM, Junio C Hamano gits...@pobox.com wrote: I would suspect that those who agree with you would appreciate if you or somebody volunteered

Re: [PATCH v2] git prompt: Use toplevel to find untracked files.

2015-03-15 Thread SZEDER Gábor
Hi, Quoting Junio C Hamano gits...@pobox.com: Cody A Taylor cody.tay...@maternityneighborhood.com writes: The __git_ps1() prompt function would not show an untracked state when the current working directory was not a parent of the untracked file. Good find, and nicely explained. Somehow I

Re: [PATCH] t2203,t4011: adjust to changed intent-to-add treatment

2015-03-15 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- For the record, the tests would need to change like this, and it makes a lot of sense. After the change, i-t-a is not a change staged in the index any more - and in fact in never

Re: [PATCH v3 1/4] git-credential-store: support multiple credential files

2015-03-15 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: Paul Tan pyoka...@gmail.com writes: I think you could even get away without passing default_fn here, and just use the rule the first file in the list is the default. Unless you are anticipating ever passing something else, but I couldn't think of a

Re: [PATCH] git.c: two memory leak fixes

2015-03-15 Thread Alexander Kuleshov
Hello Junio, This is technically correct, but do we really care about it? Yes, as i saw handle_alias called once, and we no need to care about it. I think it is wrong to free alias_string after passing it to split_cmdline() and while you still need to use the new_argv. Yes, right. sorry for

Re: [PATCH 1/2] diff --cached: do not report i-t-a entries as new

2015-03-15 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Paths marked by git add -N are simply a reminder to the user that these files should be staged. If the user does not stage any of them, git commit will not record them. Align the behavior of diff --cached and git commit. The most prominent

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-15 Thread Matthieu Moy
Yurii Shevtsov unge...@gmail.com writes: Changes 'git diff --no-index $directory $file' behaviour. Now it is transformed to 'git diff --no-index $directory/file $file' I guess the should be a $. instead of throwing an error. Try to insist on _why_ you did this more than what it does in the

Re: [PATCH RFC 1/3] add: add new --exclude option to git add

2015-03-15 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: The commit message is missing the important justification for why this new option is desirable, and why only git-add needs it. I think that is a very good point. I actually do not see why this option is ever needed, in a modern world that has the

[PATCH/RFC] completion: filter sources of git scripts from available commands

2015-03-15 Thread SZEDER Gábor
A bit of background first: - The completion script gets the lists of available and porcelain git commands from the output of 'git help -a', which, besides the official git commands from $GIT_EXEC_PATH, includes all executables from $PATH whose name begins with 'git-'. Great, this way the

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-15 Thread t . gummerer
Hi, On 03/15, Yurii Shevtsov wrote: Changes 'git diff --no-index $directory $file' behaviour. Now it is transformed to 'git diff --no-index $directory/file $file' instead of throwing an error. The commit message should describe why the change is made, see Documentation/SubmittingPatches,

Re: [PATCH 2/3] Documentation/git-add.txt: describe --exclude option

2015-03-15 Thread Eric Sunshine
On Sun, Mar 15, 2015 at 9:50 AM, Alexander Kuleshov kuleshovm...@gmail.com wrote: Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index f2eb907..4bc156a 100644 --- a/Documentation/git-add.txt +++

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-15 Thread t . gummerer
[re-added cc to the list] On 03/15, Yurii Shevtsov wrote: Hi, and thank for your reply 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/diff-no-index.c b/diff-no-index.c index 265709b..4e71b36 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -97,8 +97,25 @@

Re: [PATCH] [GSoC] Add configuration options for some commonly used command-line options

2015-03-15 Thread Koosha Khajehmoogahi
On 03/15/2015 08:29 PM, Koosha Khajehmoogahi wrote: This patch adds a 'showmerges' config. option for git-log. This option determines whether the log should contain merge commits or not. In essence, if this option is set to true, Sorry, this should be 'false'. git-log will be run as

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-15 Thread Junio C Hamano
Yurii Shevtsov unge...@gmail.com writes: Changes 'git diff --no-index $directory $file' behaviour. Now it is transformed to 'git diff --no-index $directory/file $file' instead of throwing an error. Is this asymmetric? Shouldn't git diff --no-index $file $directory behave the same way, i.e.

Re: [PATCH] [GSoC] Add configuration options for some commonly used command-line options

2015-03-15 Thread Junio C Hamano
Koosha Khajehmoogahi koo...@posteo.de writes: This patch adds a 'showmerges' config. option for git-log. This option determines whether the log should contain merge commits or not. In essence, if this option is set to true, git-log will be run as 'git-log --no-merges'. Signed-off-by: Koosha

Re: [PATCH 3/3] t3700-add: added test for --exclude option

2015-03-15 Thread Torsten Bögershausen
+test_expect_success 'Test that git add --exclude works' ' + touch foo + touch bar can be written shorter as foo bar + git add --exclude=bar . Side question: Do we need here ? Or should we test files with white space as well, like this: foo

Re: [PATCH RFC 1/3] add: add new --exclude option to git add

2015-03-15 Thread Alexander Kuleshov
Hello All, s /no/not/ ?? Thank you Philip. 2015-03-15 23:51 GMT+06:00 Torsten Bögershausen tbo...@web.de: On 2015-03-15 14.49, Alexander Kuleshov wrote: Thanks for working on Git, some minor remarks/suggestions inline. This patch introduces new --exclude option for the git add command.

Re: fatal: Unable to mark file .ruby-version

2015-03-15 Thread Kevin D
On Sun, Mar 15, 2015 at 05:58:19PM +0100, t.gumme...@gmail.com wrote: On 03/15, Arup Rakshit wrote: On Sunday, March 15, 2015 01:30:04 PM you wrote: With --assume-unchanged you're promising git that you will not change a file that is already in the repository. Git doesn't check those

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-15 Thread Eric Sunshine
In addition to the points raised by Matthieu and Thomas... On Sun, Mar 15, 2015 at 11:35 AM, Yurii Shevtsov unge...@gmail.com wrote: make git diff --no-index $directory $file DWIM better. Specify the area affected by the change, followed by a colon, followed by the change summary. Drop the

Re: [PATCH RFC 1/3] add: add new --exclude option to git add

2015-03-15 Thread Torsten Bögershausen
On 2015-03-15 18.51, Torsten Bögershausen wrote: OPT_BOOL('A', all, addremove_explicit, N_(add changes from all tracked and untracked files)), +{ OPTION_CALLBACK, 0, exclude, exclude_list, N_(pattern), What does pattern mean ? I was too fast, take that back:

Re: [PATCH 3/3] t3700-add: added test for --exclude option

2015-03-15 Thread Eric Sunshine
On Sun, Mar 15, 2015 at 9:50 AM, Alexander Kuleshov kuleshovm...@gmail.com wrote: t3700-add: added test for --exclude option Write in imperative mood: s/added/add/ Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- diff --git a/t/t3700-add.sh b/t/t3700-add.sh index

Re: [PATCH 1/3 v2] add: introduce new --exclude option

2015-03-15 Thread Philip Oakley
From: Alexander Kuleshov kuleshovm...@gmail.com Helped-by: Eric Sunshine sunsh...@sunshineco.com Helped-by: Torsten Bögershausen tbo...@web.de Helped-by: Philip Oakley philipoak...@iee.org While the kudo points are nice to have, I wouldn't say my minor contribution was worthy of the extra

Re: fatal: Unable to mark file .ruby-version

2015-03-15 Thread t . gummerer
On 03/15, Arup Rakshit wrote: On Sunday, March 15, 2015 01:30:04 PM you wrote: Hi, On 03/15, Arup Rakshit wrote: Hi, I am trying to ignore 2 files, but getting error - [arup@sztukajedzenia (SJ002)]$ git status # On branch SJ002 # Untracked files: # (use git add

[PATCH 2/3 v2] Documentation/git-add.txt: describe --exclude option

2015-03-15 Thread Alexander Kuleshov
Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- Documentation/git-add.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index f2eb907..fee97ed 100644 ---

[PATCH 3/3 v2] t3700-add: added test for --exclude option

2015-03-15 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- t/t3700-add.sh | 18 ++ 1 file changed, 18 insertions(+) diff --git a/t/t3700-add.sh b/t/t3700-add.sh index f7ff1f5..6f71c67 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -332,4 +332,22 @@ test_expect_success 'git

[PATCH 1/3 v2] add: introduce new --exclude option

2015-03-15 Thread Alexander Kuleshov
We already have core.excludesfile configuration variable which indicates a path to file which contains patterns to exclude. This patch provides ability to pass --exclude option to the git add command to exclude paths from command line in addition to which specified in the ignore files. This

Re: [PATCH RFC 1/3] add: add new --exclude option to git add

2015-03-15 Thread Philip Oakley
From: Alexander Kuleshov kuleshovm...@gmail.com This patch introduces new --exclude option for the git add command. We already have core.excludesfile configuration variable which indicates a path to file which contains patterns to exclude. This patch provides ability to pass --exclude option

Re: [PATCH RFC 1/3] add: add new --exclude option to git add

2015-03-15 Thread Torsten Bögershausen
On 2015-03-15 14.49, Alexander Kuleshov wrote: Thanks for working on Git, some minor remarks/suggestions inline. This patch introduces new --exclude option for the git add command. This patch is redundant. Shorter may be: Introduce the --exclude option for git add We already have

Re: [PATCH RFC 1/3] add: add new --exclude option to git add

2015-03-15 Thread Eric Sunshine
In addition to points raised by Philip and Torsten... On Sun, Mar 15, 2015 at 9:49 AM, Alexander Kuleshov kuleshovm...@gmail.com wrote: add: add new --exclude option to git add No need for redundant to git add, since you already have the add: prefix. This patch introduces new --exclude option

[PATCH] [GSoC] Add configuration options for some commonly used command-line options

2015-03-15 Thread Koosha Khajehmoogahi
This patch adds a 'showmerges' config. option for git-log. This option determines whether the log should contain merge commits or not. In essence, if this option is set to true, git-log will be run as 'git-log --no-merges'. Signed-off-by: Koosha Khajehmoogahi koo...@posteo.de ---

Re: [PATCH v3 1/4] git-credential-store: support multiple credential files

2015-03-15 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: Paul Tan pyoka...@gmail.com writes: I think you could even get away without passing default_fn here, and just use the rule the first file in the list is the default. Unless you are anticipating ever

What is XDG_CONFIG_HOME for exactly?

2015-03-15 Thread Robert Dailey
My understanding is that git reads the priority of configuration as follows: 1. local_repo/.git/config 2. $HOME/.gitconfig 3. $XDG_CONFIG_HOME/git/config 4. system level git config (not sure exactly where this is; not relevant to me on Windows) I have a .gitconfig in Dropbox that I symlink to my

Re: [PATCH 3/3 v2] t3700-add: added test for --exclude option

2015-03-15 Thread Eric Sunshine
On Sun, Mar 15, 2015 at 3:07 PM, Alexander Kuleshov kuleshovm...@gmail.com wrote: t3700-add: added test for --exclude option s/added/add/ Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- diff --git a/t/t3700-add.sh b/t/t3700-add.sh index f7ff1f5..6f71c67 100755 ---

Re: Bug in fetch-pack.c, please confirm

2015-03-15 Thread Jeff King
On Sat, Mar 14, 2015 at 11:37:37PM -0700, Kyle J. McKay wrote: Peff, weren't you having some issue with want and have and hide refs? Yes, but the problem was on the server side. I didn't look at this code at all. :) Tell me please how the local variable above gets initialized? So I think we

Re: [PATCH v2] git prompt: Use toplevel to find untracked files.

2015-03-15 Thread Junio C Hamano
SZEDER Gábor sze...@ira.uka.de writes: Hi, Quoting Junio C Hamano gits...@pobox.com: Cody A Taylor cody.tay...@maternityneighborhood.com writes: The __git_ps1() prompt function would not show an untracked state when the current working directory was not a parent of the untracked file.

Re: [PATCH 03/16] list-files: show paths relative to cwd

2015-03-15 Thread Duy Nguyen
On Mon, Mar 16, 2015 at 4:16 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: Exactly. We would need to sort and stuff later on, so true filenames are preserved in util-item. A cleaner way is perhaps carry all metadata in item-util and item-string remains true

Re: [PATCH 1/3 v2] add: introduce new --exclude option

2015-03-15 Thread Eric Sunshine
On Sun, Mar 15, 2015 at 3:06 PM, Alexander Kuleshov kuleshovm...@gmail.com wrote: We already have core.excludesfile configuration variable which indicates a path to file which contains patterns to exclude. This patch provides ability to pass --exclude option to the git add command to exclude

Re: [PATCH RFC 1/3] add: add new --exclude option to git add

2015-03-15 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Eric Sunshine sunsh...@sunshineco.com writes: The commit message is missing the important justification for why this new option is desirable, and why only git-add needs it. I think that is a very good point. I actually do not see why this option is

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-15 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: Is this name supposed to stand for dir'n'file,... ...I personally find the idiomatic name 'path' easier to grok, however, Junio, of course, has final say-so. If I were presented two identical patches, one calling it path and the other calling it

Re: Promoting Git developers

2015-03-15 Thread Junio C Hamano
Christian Couder christian.cou...@gmail.com writes: I wrote something about a potential Git Rev News news letter: I read it. Sounds promising. Just one suggestion on the name and half a comment. How would Git Review (or Git Monthly Review, or replace your favourite how-often-per-period-ly in

RE: Promoting Git developers

2015-03-15 Thread Randall S. Becker
On March 15, 2015 6:19 PM Christian Couder wrote: snip Just one suggestion on the name and half a comment. How would Git Review (or Git Monthly Review, or replace your favourite how-often-per-period-ly in its name) sound? I meant it to sound similar to academic journals that summarize and

Re: [PATCH 03/16] list-files: show paths relative to cwd

2015-03-15 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: Exactly. We would need to sort and stuff later on, so true filenames are preserved in util-item. A cleaner way is perhaps carry all metadata in item-util and item-string remains true filename, then do all the formatting, coloring for all strings just

Re: [PATCH RFC 1/3] add: add new --exclude option to git add

2015-03-15 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: Maybe He/We would be better off adjusting the documentation such that these 'magic' capabilities are brought out of their hiding places into regular view - e.g. a paragraph within the 'git add' documentation (and/or other commands) showing how such

Re: What is XDG_CONFIG_HOME for exactly?

2015-03-15 Thread Robert Dailey
Sorry for the continuous updates... it seems I spoke too soon. This works until you CD into a repository, then none of the settings are accessible. So yeah, basically I need to make sure I'm using this as intended... I still don't understand the purpose of the XDG thing. On Sun, Mar 15, 2015 at

Re: [PATCH v2] git prompt: Use toplevel to find untracked files.

2015-03-15 Thread Cody Taylor
SZEDER Gábor sze...@ira.uka.de writes: Somehow I had a hard time making sense out of when the current working directory was not a parent of the untracked file. Perhaps when the untracked files are outside of the current working directory would be easier to grok? That description doesn't

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-15 Thread Eric Sunshine
[re-adding cc:git] On Sun, Mar 15, 2015 at 2:45 PM, Yurii Shevtsov unge...@gmail.com wrote: On Sun, Mar 15, 2015 at 11:35 AM, Yurii Shevtsov unge...@gmail.com wrote: make git diff --no-index $directory $file DWIM better. Specify the area affected by the change, followed by a colon, followed

Re: Bug in fetch-pack.c, please confirm

2015-03-15 Thread Kyle J. McKay
On Mar 15, 2015, at 00:30, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Kyle J. McKay mack...@gmail.com writes: Hi guys, So I was looking at fetch-pack.c (from master @ 52cae643, but I think it's the same everywhere): ... - hashcpy(ref-new_sha1,

Re: What is XDG_CONFIG_HOME for exactly?

2015-03-15 Thread Robert Dailey
As a follow-up, I tested the following in my .bashrc: # Utilize different GIT settings based on platform if [[ $OSTYPE == 'msys' || $OSTYPE == 'cygwin' ]]; then echo 'Using WINDOWS specific git settings' export XDG_CONFIG_HOME=.config-windows else echo 'Using LINUX specific git

Re: [PATCH 2/3 v2] Documentation/git-add.txt: describe --exclude option

2015-03-15 Thread Eric Sunshine
On Sun, Mar 15, 2015 at 3:06 PM, Alexander Kuleshov kuleshovm...@gmail.com wrote: Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index f2eb907..fee97ed 100644 ---

Why do my .avi files not appear in my XBMC library?

2015-03-15 Thread Velemoochi
Why do my .avi files not appear in my XBMC library? Convert universal AVI to MP4/WMV for playback on XBMC? This AVI to XBMC Tutorial teaches convert AVI to XBMC video format with fast speed. XBMC has been the most popular media player that can be used to build a home theater system. Although

Re: [PATCH/RFC][GSoC] make git diff --no-index $directory $file DWIM better.

2015-03-15 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: --- a/diff-no-index.c +++ b/diff-no-index.c @@ -97,8 +97,25 @@ static int queue_diff(struct diff_options *o, if (get_mode(name1, mode1) || get_mode(name2, mode2)) return -1; - if (mode1 mode2 S_ISDIR(mode1)

Re: fatal: Unable to mark file .ruby-version

2015-03-15 Thread Arup Rakshit
On Sunday, 15 March 2015 11:15 PM, Kevin D m...@ikke.info wrote: On Sun, Mar 15, 2015 at 05:58:19PM +0100, t.gumme...@gmail.com wrote: On 03/15, Arup Rakshit wrote: On Sunday, March 15, 2015 01:30:04 PM you wrote: With --assume-unchanged you're promising git that you will not change