Add protocol imap, imaps, ftp and smtp for credential-osxkeychain.
Signed-off-by: Xidorn Quan
Acked-by: John Szakmeister
Acked-by: Jeff King
---
contrib/credential/osxkeychain/git-credential-osxkeychain.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/contrib/
Sorry, I reversed the revisions. This one should be correct.
git-gui/po/fr.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-gui/po/fr.po b/git-gui/po/fr.po
index 40441db..0aff186 100644
--- a/git-gui/po/fr.po
+++ b/git-gui/po/fr.po
@@ -1139,7 +1139,7 @@ msgstr "Standard
Hi,
My commit author name is "Jason A. Donenfeld". Because this has a dot,
SMTP handling likes to put it in quotes.
git-send-email has this line:
if (defined $author and $author ne $sender) {
With my name, this always winds up false, because it's comparing
'"Jason A. Donenfeld" ' wit
In diff_tree_combined we make a copy of diffopts. In
try_to_follow_renames, called via diff_tree_sha1, we free and
re-initialize diffopts->pathspec->items. Since we did not make a deep
copy of diffopts in diff_tree_combined, the original diffopts does not
get the update. By the time we return from
On Mon, 27 May 2013 16:11:06 +0430, Omid Mo'menzadeh
wrote:
> Dear Tomas,
> I was using your git bundler a few days ago, and it worked like a charm.
> But there is a problem out there, and that is most users of your bundler
> are people using an unstable internet connection. I downloaded the bund
On MinGW, sparse issues an "'get_st_mode_bits' not declared. Should
it be static?" warning. The MinGW and MSVC builds do not see the
declaration of this function, within git-compat-util.h, due to its
placement within an preprocessor conditional.
In order to suppress the warning, we simply move th
Antoine Pelisse wrote:
> So now we have two fixes for the same issue, don't we ?
> You probably missed $gmane/225534.
Gah, missed that. Sorry for the noise.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info
We should free objects before leaving.
Signed-off-by: Felipe Contreras
---
sequencer.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index ab6f8a7..7eeae2f 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -626,12 +626,15 @@ static int do_pick_c
Pretty much what it says on the tin.
Signed-off-by: Felipe Contreras
---
Documentation/git-cherry-pick.txt | 3 +++
builtin/revert.c| 2 ++
sequencer.c | 5 -
sequencer.h | 1 +
t/t3508-cherry-pick-many-commits.sh | 13
Hi,
It doesn't make sense for the user to be interrupted constantly.
Felipe Contreras (2):
sequencer: trivial fix
cherry-pick: add --skip-commits option
Documentation/git-cherry-pick.txt | 3 +++
builtin/revert.c| 2 ++
sequencer.c | 12 ++
On Mon, May 27, 2013 at 11:30 AM, Antoine Pelisse wrote:
> Hey Felipe,
> I know that has been integrated a while ago.
>
> On Thu, Apr 11, 2013 at 2:23 PM, Felipe Contreras
> wrote:
>> When cloning or pushing fails, we don't want to show a stack-trace.
>>
>> diff --git a/contrib/remote-helpers/git
On Mon, May 27, 2013 at 05:33:09PM +0100, John Keeping wrote:
> > Ah, I see. It is not "the refspec on the command-line does not match a
> > configured refspec", but rather "there exists a configured non-pattern
> > refspec that does not match what was on the command-line (even if what
> > was on
Since commit f269048 (fetch: opportunistically update tracking refs,
2013-05-11) we update tracking refs opportunistically when fetching
remote branches. However, if there is a configured non-pattern refspec
that does not match any of the refspecs given on the command line then a
fatal error occur
Hey Felipe,
I know that has been integrated a while ago.
On Thu, Apr 11, 2013 at 2:23 PM, Felipe Contreras
wrote:
> When cloning or pushing fails, we don't want to show a stack-trace.
>
> diff --git a/contrib/remote-helpers/git-remote-hg
> b/contrib/remote-helpers/git-remote-hg
> index ff89725..
On Mon, May 27, 2013 at 05:01:29PM +0100, John Keeping wrote:
> > I'm not sure I understand what the last sentence means. I tried to add a
> > test like:
> [...]
> > but it does not fail with the existing code. Can you give an example
> > that fails?
>
> I have this in my .git/config for git.git:
On Mon, May 27, 2013 at 11:46:24PM +0800, Xidorn Quan wrote:
> > We may also eventually want IMAP for git-imap-send, but we have not yet
> > implemented credential-helper support there. We may also want http/socks
> > proxy authentication, but we also have not implemented the git side of
> > that
On Mon, May 27, 2013 at 11:42:52AM -0400, Jeff King wrote:
> On Mon, May 27, 2013 at 12:40:25PM +0100, John Keeping wrote:
>
> > Since commit f269048 (fetch: opportunistically update tracking refs,
> > 2013-05-11) we update tracking refs opportunistically when fetching
> > remote branches. Howeve
On Mon, May 27, 2013 at 11:08 PM, Jeff King wrote:
[snip]
>
> This looks good to me. Git will ask for "protocol=ftp" when
> accessing the dumb protocol over ftp. And it will ask for smtp via
> git-send-email since 4d31a44 (git-send-email: use git credential to
> obtain password, 2013-02-12).
>
> W
On Mon, May 27, 2013 at 12:40:25PM +0100, John Keeping wrote:
> Since commit f269048 (fetch: opportunistically update tracking refs,
> 2013-05-11) we update tracking refs opportunistically when fetching
> remote branches. However, if a refspec is given on the command line
> that does not include
hello list,
I have been using git-svn in an corporate environment where svn repo has lot of
branches, (lot means > 100). To avoid cloning all branches my config looks as
below
[svn-remote "svn"]
url = svn+ssh://url
fetch = srcroot/trunk:refs/remotes/trunk
branches = srcr
When deciding whether or not we should link a working tree file into
the temporary right-hand directory for a directory diff, we
currently behave differently in the --symlink and --no-symlink
cases. If using symlinks any identical files are linked across but
with --no-symlink only files that conta
On Mon, May 27, 2013 at 10:35:59PM +0800, Xidorn Quan wrote:
> diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
> b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
> index 3940202..648fadd 100644
> --- a/contrib/credential/osxkeychain/git-credential-osxkeychain
On Mon, May 27, 2013 at 10:28 PM, John Szakmeister wrote:
[snip]
>
> You'll need to read Documentation/SubmittingPatches (here's a link to
> a version online:
> https://github.com/git/git/blob/master/Documentation/SubmittingPatches).
>
> You should resend this patch with the fix and change "[PATCH
So now we have two fixes for the same issue, don't we ?
You probably missed $gmane/225534.
On Mon, May 27, 2013 at 4:20 PM, Ramkumar Ramachandra
wrote:
> Commit a24a41e (git-commit: only append a newline to -m mesg if
> necessary, 2013-02-18) introduced a regression: when
> --allow-empty-message
Add protocol ftp and smtp for credential-osxkeychain.
Acked-by: John Szakmeister
Signed-off-by: Xidorn Quan
---
contrib/credential/osxkeychain/git-credential-osxkeychain.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/contrib/credential/osxkeychain/git-credential-osx
On Mon, May 27, 2013 at 9:55 AM, Xidorn Quan wrote:
[snip]
> I thought that SSH password logins can benefit from it, but I just
> found that it is wrong because it seems that SSH client is responsible
> for authenticating. Consequently, supporting SSH here is useless.
> I will remove that lines an
I forgot to reply to the mailing list and now something went wrong with
the messages in mutt =P
Commit a24a41e (git-commit: only append a newline to -m mesg if
necessary, 2013-02-18) introduced a regression: when
--allow-empty-message is used and an empty message is explicitly
specified with -m "", git commit still launches $EDITOR unnecessarily.
The commit (correctly) fixes opt_parse_m() to
Ramkumar Ramachandra wrote:
> builtin/commit.c | 2 ++
> 1 file changed, 2 insertions(+)
I just made this dependent on the order in which options are parsed.
If --allow-empty-message is specified before -m "", it works.
Otherwise, not.
Sorry about the stupidity.
--
To unsubscribe from this list:
Commit a24a41e (git-commit: only append a newline to -m mesg if
necessary, 2013-02-18) introduced a regression: when
--allow-empty-message is used and an empty message is explicitly
specified with -m "", git commit still launches $EDITOR unnecessarily.
The commit (correctly) fixes opt_parse_m() to
On Mon, May 27, 2013 at 6:27 PM, John Szakmeister wrote:
>
> On Mon, May 27, 2013 at 3:57 AM, Xidorn Quan wrote:
> > Add protocol ftp, smtp, and ssh for credential-osxkeychain.
> > ---
> > contrib/credential/osxkeychain/git-credential-osxkeychain.c | 8 +++-
> > 1 file changed, 7 insertions(
Since commit f269048 (fetch: opportunistically update tracking refs,
2013-05-11) we update tracking refs opportunistically when fetching
remote branches. However, if a refspec is given on the command line
that does not include a configured (non-pattern) refspec a fatal error
occurs.
Fix this by s
Commit b60daf0 (Make git-prune-packed a bit more chatty. - 2007-01-12)
changes the meaning of prune_packed_objects()'s argument, from "dry
run or not dry run" to a bitmap.
It however forgot to update prune_packed_objects() caller in
builtin/prune.c to use new DRY_RUN macro. It's fine (for a long t
On Mon, May 20, 2013 at 11:17 PM, Junio C Hamano wrote:
> Think why the user has such a hard to type ref in the first place.
> The user may have done this previously, thinking that he is detaching
> the HEAD to fix an earlier mistake in a branch:
>
> $ BAD_COMMIT=$(git rev-parse nd/magic~8)
>
On Mon, May 27, 2013 at 3:57 AM, Xidorn Quan wrote:
> Add protocol ftp, smtp, and ssh for credential-osxkeychain.
> ---
> contrib/credential/osxkeychain/git-credential-osxkeychain.c | 8 +++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/credential/osxkeychain/git-
On Mon, May 27, 2013 at 07:43:13PM +1000, Zenaan Harkness wrote:
> In my later email, I changed it to mv - should have highlighted there
> was a change. I got bitten, on a small repo thankfully, where a perms
> or ownership problem caused the whole repo to disappear. So mv it is
> :)
Do you really
On 5/27/13, Matthieu Moy wrote:
> Zenaan Harkness writes:
>
>>rm -rf $repo
>
> The user would appreciate if you check that there are no uncommited
> changes and no untracked files (at least no untracked and not ignored
> files) before running this.
>
> Also, it's "$repo", not just $repo, or y
Antoine Pelisse writes:
>> -msgstr "Copie complète (plus lent, sauvegarde redondante)"
>> +msgstr "Copy complète (plus lent, sauvegarde redondante)"
>
> I still don't get why "Copie" is replaced by "Copy" ?
Yes, this is clearly wrong. Copie is french, Copy is not.
--
Matthieu Moy
http://www-ve
Zenaan Harkness writes:
>rm -rf $repo
The user would appreciate if you check that there are no uncommited
changes and no untracked files (at least no untracked and not ignored
files) before running this.
Also, it's "$repo", not just $repo, or you'll get surprising behavior if
$repo contain
Add protocol ftp, smtp, and ssh for credential-osxkeychain.
---
contrib/credential/osxkeychain/git-credential-osxkeychain.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
b/contrib/credential/osxkeychain/git-c
On Sun, May 26, 2013 at 10:35 PM, Johannes Sixt wrote:
> Am 26.05.2013 19:58, schrieb Antoine Pelisse:
>> The goal of the patch is to introduce the GNU diff
>> -B/--ignore-blank-lines as closely as possible. The short option is not
>> available because it's already used for "break-rewrites".
>>
>>
41 matches
Mail list logo
