Re: [PATCH 7/7] Make 'stg pull' use git-fetch and not git-pull.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

From: Catalin Marinas <catalin.marinas@...>

To: Yann Dirson <ydirson@...>

Cc: <git@...>

Subject: Re: [PATCH 7/7] Make 'stg pull' use git-fetch and not git-pull.

Date: Wednesday, January 31, 2007 - 7:44 pm

On 29/01/07, Yann Dirson <ydirson@altern.org> wrote:
quoted text> We introduce a new pull-does-rebase setting, as companion to pullcmd.
> This allows to use both pullcmd's that need a rebase (like git-fetch)
> and pullcmd's that do not (like git-pull).

Thanks for the patches. I applied all of them but I have a question on this one:

quoted text> +    if (config.get('stgit.pull-does-rebase')):
> +        # FIXME!
> +        reset(tree_id = rev_parse(repository))

Why the "FIXME" here? The alternative is switch() and it might be safer.

-- 
Catalin
-
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] StGIT, remotes, and parent, Yann Dirson, (Mon Jan 29, 7:05 pm)

[PATCH 7/7] Make 'stg pull' use git-fetch and not git-pull., Yann Dirson, (Mon Jan 29, 7:05 pm)

Re: [PATCH 7/7] Make 'stg pull' use git-fetch and not git-pu..., Catalin Marinas, (Wed Jan 31, 7:44 pm)

Re: [PATCH 7/7] Make 'stg pull' use git-fetch and not git-pu..., Yann Dirson, (Thu Feb 1, 2:47 pm)

[PATCH 6/7] Have 'stg branch --create' record parent informa..., Yann Dirson, (Mon Jan 29, 7:05 pm)

[PATCH 5/7] Basic support for keeping a ref to the parent br..., Yann Dirson, (Mon Jan 29, 7:05 pm)

[PATCH 4/7] Allows extraction of information about remotes., Yann Dirson, (Mon Jan 29, 7:05 pm)

[PATCH 3/7] Move identification of parent branch's remote de..., Yann Dirson, (Mon Jan 29, 7:05 pm)

[PATCH 2/7] Add caching to the new config class., Yann Dirson, (Mon Jan 29, 7:05 pm)

[PATCH 1/7] Make stgit.config use git-repo-config., Yann Dirson, (Mon Jan 29, 7:05 pm)


linux-kernel:
Tony Lindgren	[PATCH 26/90] ARM: OMAP: abstract debug card setup (smc, leds)
Greg Kroah-Hartman	[PATCH 001/196] Chinese: Add the known_regression URI to the HOWTO
Vladislav Bolkhovitin	Re: Integration of SCST in the mainstream Linux kernel
Jesper Juhl	Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3
git:

linux-netdev:
Gerrit Renker	[PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side)
Jarek Poplawski	[PATCH] pkt_sched: Destroy gen estimators under rtnl_lock().
David Miller	[GIT]: Networking
Frans Pop	svc: failed to register lockdv1 RPC service (errno 97).
openbsd-misc:

Re: [PATCH 7/7] Make 'stg pull' use git-fetch and not git-pull.

Online users