Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merge commands in error message

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Miklos Vajna <vmiklos@...>
Cc: <git@...>
Date: Saturday, July 26, 2008 - 1:01 pm

Hi,

On Sat, 26 Jul 2008, Miklos Vajna wrote:


What I meant is: if you change the strcmp to strncmp because one of the 
both strings is not supposed to be NUL terminated, you still want to make 
sure that one is not a strict prefix of the other.

Ciao,
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/7] Allow custom merge strategies, Miklos Vajna, (Sat Jul 26, 7:54 am)
[PATCH 0/6] Allow custom merge strategies, take 2, Miklos Vajna, (Sun Jul 27, 9:21 pm)
[PATCH 0/5] Allow custom merge strategies, take 3, Miklos Vajna, (Tue Jul 29, 11:24 am)
[PATCH 4/5] builtin-merge: allow using a custom strategy, Miklos Vajna, (Tue Jul 29, 11:25 am)
Re: [PATCH 3/6] builtin-help: make it possible to exclude so..., Johannes Schindelin, (Sun Jul 27, 10:43 pm)
Re: [PATCH 3/6] builtin-help: make it possible to exclude so..., Johannes Schindelin, (Mon Jul 28, 5:58 am)
Re: [PATCH 5/6] builtin-merge: avoid non-strategy git-merge ..., Johannes Schindelin, (Mon Jul 28, 9:06 am)
[PATCH] builtin-merge: allow using a custom strategy, Miklos Vajna, (Mon Jul 28, 7:48 pm)
Re: [PATCH] builtin-merge: allow using a custom strategy, Johannes Schindelin, (Mon Jul 28, 7:59 pm)
Re: [PATCH 6/6] Add a new test for using a custom merge stra..., Johannes Schindelin, (Mon Jul 28, 9:12 am)
Re: [PATCH 6/6] Add a new test for using a custom merge stra..., Johannes Schindelin, (Mon Jul 28, 7:54 pm)
Re: [PATCH 2/7] builtin-help: change the current directory b..., Johannes Schindelin, (Sun Jul 27, 4:21 pm)
[PATCH] Avoid chdir() in list_commands_in_dir(), Johannes Schindelin, (Sun Jul 27, 4:34 pm)
Re: [PATCH 2/7] builtin-help: change the current directory b..., Johannes Schindelin, (Sat Jul 26, 10:58 am)
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merge ..., Johannes Schindelin, (Sat Jul 26, 11:08 am)
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merge ..., Johannes Schindelin, (Sat Jul 26, 11:38 am)
Re: [PATCH 7/7] builtin-merge: avoid non-strategy git-merge ..., Johannes Schindelin, (Sat Jul 26, 1:01 pm)