Hi everyone,
I have a large Git project which I would like to dissect into
subprojects with their own repositories. Git subtrees are ideal for
this task: I first
* create a branch with the contents of only one subfoldergit subtree
split -P -b
and then
* pull this branch into another reposit
Am 11.06.2015 um 20:59 schrieb Augie Fackler:
When developing server software, it's often helpful to save a
potentially-bogus pack for later analysis. This makes that trivial,
instead of painful.
When you develop server software, shouldn't you test drive the server
via the bare metal protocol
Anish R Athalye writes:
> Now, when running `tail -n 3 .git/config`, you see:
>
> [branch "master"]
> [branch "master"]
> description = asdf\n
Yes, this is a known bug that no one fixed yet. It was planned for
Tanay's (Cc-ed) GSoC last year, but the project evolved in another
Hi all,
This is a very minor bug I noticed (perhaps not even worth fixing because it’s
not harmful), but I thought that I’d point it out.
I found that if I used `git branch --edit-description` to add and remove
descriptions a couple times, it would accumulate extra lines in my
`.git/config` in
On Wed, Jun 10, 2015 at 08:05:32AM -0700, Junio C Hamano wrote:
> Torsten Bögershausen writes:
>
> > git checkout can be used to revert changes in the working tree.
>
> I somehow thought that concensus in the recent thread was that
> "restore", not "revert", is the more appropriate wording?
>
On Thu, Jun 11, 2015 at 10:37 AM, Panagiotis Astithas wrote:
> The output of "pmset -g batt" changed at some point from
> "Currently drawing from 'AC Power'" to the slightly different
> "Now drawing from 'AC Power'". Starting the match from "drawing"
> makes the check work in both old and new vers
Difference between v3 and v4 of this patch:
- cleaned up changes in rearrange_squash() function
- consolidated autosquash test
Michael Rappazzo (1):
git-rebase--interactive.sh: add config option for custom instruction
format
Documentation/git-rebase.txt | 7 +++
git-rebase--
A config option 'rebase.instructionFormat' can override the
default 'oneline' format of the rebase instruction list.
Since the list is parsed using the left, right or boundary mark plus
the sha1, they are prepended to the instruction format.
Signed-off-by: Michael Rappazzo
---
Documentation/git
It can be useful to have grafts or replace refs for specific use-cases while
keeping the default "view" of the repository pristine (or with a different
set of grafts/replace refs).
It is possible to use a different graft file with GIT_GRAFT_FILE, but while
replace refs are more powerful, they don'
Mike Hommey writes:
> On Thu, Jun 11, 2015 at 08:16:02AM -0700, Junio C Hamano wrote:
>> Mike Hommey writes:
>>
>> > I do agree that this is all confusing, but allow me to point out that
>> > it's already plenty confusing: "namespace" is a term that has been used to
>> > designate a generic kin
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hello,
I have came up with an idea
# Yep I know, exactly that kind of e-mail everyone wants to read ;)
and I'm working currently on a shell-prototype to face the following
situation and problem and need some feedback/advise:
I often build in example
On Thu, Jun 11, 2015 at 08:16:02AM -0700, Junio C Hamano wrote:
> Mike Hommey writes:
>
> > I do agree that this is all confusing, but allow me to point out that
> > it's already plenty confusing: "namespace" is a term that has been used to
> > designate a generic kind of namespace *and* refs/nam
Michael Edgar writes:
> On Thu, Jun 11, 2015 at 10:32 AM, Jeff King wrote:
>> On Thu, Jun 11, 2015 at 08:02:33PM +0700, Duy Nguyen wrote:
>>
>>> > I see that do_fetch_pack checks server_supports("shallow"). Is that
>>> > enough to cover all fetch cases? And if it is, why does it not cover the
>>
Lol, sorry. I meant to post in the Vagrant forums. Too many projects going on
at the same time!
-Original Message-
From: Konstantin Khomoutov [mailto:kostix+...@007spb.ru]
Sent: Thursday, June 11, 2015 3:43 PM
To: BGaudreault Brian
Cc: git@vger.kernel.org
Subject: Re: proxy_windows_386
Junio C Hamano writes:
> "brian m. carlson" writes:
>
>> On Wed, Jun 10, 2015 at 11:51:14PM +, brian m. carlson wrote:
>>> On Wed, Jun 10, 2015 at 03:50:32PM -0700, Junio C Hamano wrote:
>>> > "brian m. carlson" writes:
>>> > > Convert struct object to object_id
>>> >
>>> > It seems that
Karthik Nayak writes:
>> ... but after PATCH 7, filter and array are passed to ref_filter so you
>> don't have this overhead anyway. Makes sense.
>>
> Yes, there we wouldn't have a ref_cbdata in 'for-each-ref'.
> But this would be taken care of in 'filter_refs()'.
> "Makes sense." Not sure if you
On Thu, 11 Jun 2015 17:46:58 +
BGaudreault Brian wrote:
> Hello, when connecting to a Vagrant Shared VM via SSH, I'm getting a
> Windows Firewall prompt about 'proxy_windows_386.exe' (in C:\Program
> Files\hashicorp\vagrant\embedded\gems\gems\vagrant-share-1.1.0
> \localbin\), which looks lik
Augie Fackler writes:
> @@ -708,9 +708,8 @@ static int get_pack(struct fetch_pack_args *args,
> cmd.argv = argv;
> av = argv;
> *hdr_arg = 0;
> + struct pack_header header;
decl-after-stmt here...
> if (!args->keep_pack && unpack_limit) {
> - struct pack_
Hello,
Using git version 1.9.2-preview20140411, in Git Bash for Windows, performing a
"git pull --rebase", received an unhandled exception. Here is the stack trace:
MSYS-1.0.12 Build:2012-07-05 14:56
Exception: STATUS_ACCESS_VIOLATION at eip=00418DAA
eax=680A38E4 ebx=685704CC ecx=00542E38 edx=0
On 06/12/2015 12:43 AM, Matthieu Moy wrote:
Karthik Nayak writes:
> On 06/11/2015 11:11 PM, Matthieu Moy wrote:
>> Karthik Nayak writes:
>>
>>> +struct ref_filter_cbdata {
>>> +struct ref_array array;
>>> +struct ref_filter filter;
>>> +};
>>
>> I didn't notice this at first, but why i
Hello, when connecting to a Vagrant Shared VM via SSH, I'm getting a Windows
Firewall prompt about 'proxy_windows_386.exe' (in C:\Program
Files\hashicorp\vagrant\embedded\gems\gems\vagrant-share-1.1.0\localbin\),
which looks like a malware-type name. Here's the message: "Windows Security
Alert
Karthik Nayak writes:
> On 06/11/2015 11:11 PM, Matthieu Moy wrote:
>> Karthik Nayak writes:
>>
>> > +struct ref_filter_cbdata {
>> > +struct ref_array array;
>> > +struct ref_filter filter;
>> > +};
>>
>> I didn't notice this at first, but why introduce the structure like this
>> when y
When developing server software, it's often helpful to save a
potentially-bogus pack for later analysis. This makes that trivial,
instead of painful. This is made a little complicated by the fact that
in some cases (like cloning from smart-http, but not from a local repo)
the fetch code reads the p
Am 11.06.2015 um 18:11 schrieb Phil Hord:
On Tue, Jun 9, 2015 at 2:40 PM, Jens Lehmann wrote:
Am 07.06.2015 um 08:26 schrieb Stefan Beller:
On 06.06.2015 12:53, Luca Milanesio wrote:
On 6 Jun 2015, at 18:49, Phil Hord wrote:
On Fri, Jun 5, 2015, 2:58 AM lucamilanesio
wrote:
Ideally, as
Ed Avis writes:
> I guess 'replace' would be a better word than 'restore' for the current
> behaviour.
Hmm, but wouldn't replace have the same issue as overwrite, namely,
'replace with what?'.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...
On Thu, Jun 11, 2015 at 10:44 AM, Augie Fackler wrote:
> When developing server software, it's often helpful to save a
> potentially-bogus pack for later analysis. This makes that trivial,
> instead of painful. This is made a little complicated by the fact that
> in some cases (like cloning from s
On Thu, Jun 11, 2015 at 10:32 AM, Jeff King wrote:
> On Thu, Jun 11, 2015 at 08:02:33PM +0700, Duy Nguyen wrote:
>
>> > I see that do_fetch_pack checks server_supports("shallow"). Is that
>> > enough to cover all fetch cases? And if it is, why does it not cover the
>> > matching clone cases?
>>
>>
On 06/11/2015 11:11 PM, Matthieu Moy wrote:
Karthik Nayak writes:
> +struct ref_filter_cbdata {
> +struct ref_array array;
> +struct ref_filter filter;
> +};
I didn't notice this at first, but why introduce the structure like this
when you are going to turn it into pointers later in PA
On Thu, Jun 11, 2015 at 3:21 AM, Paul Tan wrote:
> git-am.sh supports mbox, stgit and mercurial patches. Re-implement
> support for splitting out mbox/maildirs using git-mailsplit, while also
> implementing the framework required to support other patch formats in
> the future.
>
> Re-implement sup
Karthik Nayak writes:
> +struct ref_filter_cbdata {
> + struct ref_array array;
> + struct ref_filter filter;
> +};
I didn't notice this at first, but why introduce the structure like this
when you are going to turn it into pointers later in PATCH 7:
Karthik Nayak writes:
> --- a/ref-
When developing server software, it's often helpful to save a
potentially-bogus pack for later analysis. This makes that trivial,
instead of painful. This is made a little complicated by the fact that
in some cases (like cloning from smart-http, but not from a local repo)
the fetch code reads the p
On Thu, Jun 11, 2015 at 3:21 AM, Paul Tan wrote:
> git-am applies a series of patches. If the process terminates
> abnormally, we want to be able to resume applying the series of patches.
> This requires the session state to be saved in a persistent location.
>
> Implement the mechanism of a "patc
Introduce filter_refs() which will act as an API for filtering
a set of refs. Based on the type of refs the user has requested,
we iterate through those refs and apply filters as per the
given ref_filter structure and finally store the filtered refs
in the ref_array structure.
Currently this will
On 06/11/2015 10:30 PM, Matthieu Moy wrote:
I think it is more common to have options at the end, so I'd write it as
filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);
(changing the declaration too, obviously)
I really like the way cmd_for_each_ref looks like now.
Karthik Nayak writes:
> The previous version of this patch can be found here:
> http://thread.gmane.org/gmane.comp.version-control.git/270922
>
> Changes found in this version:
> *Various changes to the 'filter_refs()' function.
> *Split 'for-each-ref: clean up code' into two commits.
> *
Karthik Nayak writes:
> + filter_refs(&array, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN,
> &filter);
I think it is more common to have options at the end, so I'd write it as
filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);
(changing the declaration too, obvio
In 'grab_single_ref()' remove the extra count variable 'cnt' and
use the variable 'grab_cnt' of structure 'grab_ref_cbdata' directly
instead.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
builtin/for-each-ref.c | 7 ++-
1 file changed, 2 insertion
On Tue, Jun 9, 2015 at 2:40 PM, Jens Lehmann wrote:
> Am 07.06.2015 um 08:26 schrieb Stefan Beller:
>>
>> On 06.06.2015 12:53, Luca Milanesio wrote:
On 6 Jun 2015, at 18:49, Phil Hord wrote:
On Fri, Jun 5, 2015, 2:58 AM lucamilanesio
wrote:
>
> Ideally, as a "git clon
Rename some of the functions and make them publicly available.
This is a preparatory step for moving code from 'for-each-ref'
to 'ref-filter' to make meaningful, targeted services available to
other commands via public APIs.
Functions renamed are:
parse_atom()-> parse_ref_filter_a
Rename all the variables called sort to sorting to match the
function/structure name changes made in the previous patch.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
builtin/for-each-ref.c | 28 ++--
1 file changed, 14 inserti
This would remove the need of using a pointer to store refname.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
ref-filter.c | 7 ---
ref-filter.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
ind
This is step one of creating a common library for 'for-each-ref',
'branch -l' and 'tag -l'. This creates a header file with the
functions and data structures that ref-filter will provide.
We move the data structures created in for-each-ref to this header
file.
Mentored-by: Christian Couder
Mentor
Move most of the code from 'for-each-ref' to 'ref-filter' to make
it publicly available to other commands, this is to unify the code
of 'tag -l', 'branch -l' and 'for-each-ref' so that they can share
their implementations with each other.
Add 'ref-filter' to the Makefile, this completes the moveme
Introduce filter_refs() which will act as an API for filtering
a set of refs. Based on the type of refs the user has requested,
we iterate through those refs and apply filters as per the
given ref_filter structure and finally store the filtered refs
in the ref_array structure.
Currently this will
Introduce and implement 'ref_array_clear()' which will free
all allocated memory for 'ref_array'.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
builtin/for-each-ref.c | 21 +
1 file changed, 21 insertions(+)
diff --git a/builtin/f
Introduce 'ref_filter_cbdata' which will hold 'ref_filter'
(conditions to filter the refs on) and 'ref_array' (the array
of ref_array_items). Modify the code to use these new structures.
This is a preparatory patch to eventually move code from 'for-each-ref'
to 'ref-filter' and make it publicly av
Rename 'refinfo' to 'ref_array_item' as a preparatory step for
introduction of new structures in the forthcoming patch.
Re-order the fields in 'ref_array_item' so that refname can be
eventually converted to a FLEX_ARRAY.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Kar
The comment in 'ref_sort' hasn't been changed 9f613dd.
Change the comment to reflect changes made in the code since
9f613dd.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
builtin/for-each-ref.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
di
Extract two helper functions out of grab_single_ref(). Firstly,
new_refinfo() which is used to allocate memory for a new refinfo
structure and copy the objectname, refname and flag to it.
Secondly, match_name_as_path() which when given an array of patterns
and the refname checks if the refname matc
On 06/09/2015 06:28 PM, brian m. carlson wrote:
> get_oid_hex is already available for parsing hex object IDs into struct
> object_id, but parsing code still must hard-code the number of bytes
> read. Introduce parse_oid_hex, which accepts an optional length, and
> also returns the number of bytes
The previous version of this patch can be found here:
http://thread.gmane.org/gmane.comp.version-control.git/270922
Changes found in this version:
*Various changes to the 'filter_refs()' function.
*Split 'for-each-ref: clean up code' into two commits.
*Other small changes.
--
Regards
I think I've found where this issue is located:
https://translations.launchpad.net/ubuntu/quantal/+source/git/+pots/git/es/+filter?person=franciscomol
I'll try to fix it over there.
Cheers,
Gabriel
El jue, 11 de jun 2015 a las 12:47 , Junio C Hamano
escribió:
Gabriel writes:
Hi Johannes
Gabriel writes:
> Hi Johannes,
>
> I tried following your instructions but I can locate the sentence
> where the bad translation is. Please see here:
> http://stackoverflow.com/questions/30783818/find-instance-of-string-in-git-core-with-git-grep
>
> Any advice?
Perhaps you are seeing a bad trans
I visually inspected patches 1 and 2 without finding any problems.
Regarding this patch, I saw a few functions where you could convert
local variables to "struct object_id" and then change function calls
like hashcpy() to oidcpy(). See below. I'm not sure if it makes sense to
do that in this same
"Simon A. Eugster" writes:
> From: "Simon A. Eugster"
>
> Signed-off-by: Simon A. Eugster
> ---
> Documentation/git-checkout.txt | 6 +-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
> index d263a56..5c3ef8
Antoine Delaite writes:
> - # start_bad_good is used to detect if we did a
> - # 'git bisect start bad_rev good_rev'
> - start_bad_good=0
> + # terms_defined is used to detect if we did a
> + # 'git bisect start bad_rev good_rev' or if the user
> + # defined his own terms
Antoine Delaite writes:
> - if (!strcmp(refname, "bad")) {
> + char good_prefix[256];
> + strcpy(good_prefix, name_good);
> + strcat(good_prefix, "-");
You are silently adding a restriction here: name_good must be small
enough to fit in a 256-bytes array. It's not a terrible rest
Mike Hommey writes:
> I do agree that this is all confusing, but allow me to point out that
> it's already plenty confusing: "namespace" is a term that has been used to
> designate a generic kind of namespace *and* refs/namespaces. See for
> example:
>
> https://github.com/git/git/blob/master/Doc
Hi Johannes,
I tried following your instructions but I can locate the sentence where
the bad translation is. Please see here:
http://stackoverflow.com/questions/30783818/find-instance-of-string-in-git-core-with-git-grep
Any advice?
Cheers,
Gabriel
El jue, 11 de jun 2015 a las 12:10 , Gabrie
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> Junio C Hamano writes:
>>
>>> +bisect_terms () {
>>> + test $# -eq 2 ||
>>> + die "You need to give me at least two arguments"
>>> +
>>> + if ! test -s "$GIT_DIR/BISECT_START"
>>> + then
>>> + echo $1 >"$GIT_DIR/BISECT_TERMS"
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> Antoine Delaite writes:
>>
>>> -USAGE='[help|start|bad|good|new|old|skip|next|reset|visualize|replay|log|run]'
>>> +USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|replay|log|run]'
>>
>> I think this patch makes the whole se
I guess 'replace' would be a better word than 'restore' for the current
behaviour.
--
Ed Avis
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Torsten Bögershausen writes:
> On 2015-06-10 17.05, Junio C Hamano wrote:
>
>>> -git-checkout - Checkout a branch or paths to the working tree
>>> +git-checkout - Switch branches or reverts changes in the working tree
>>
>> Two verbs in different moods; either "switch branches or restore
>> chan
Hi Mike,
On 2015-06-11 16:02, Mike Rappazzo wrote:
> On Thu, Jun 11, 2015 at 9:40 AM, Johannes Schindelin
> wrote:
>>
>> On 2015-06-11 03:30, Michael Rappazzo wrote:
>>
>>> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
>>> index dc3133f..6d14315 100644
>>> --- a/git-rebase-
The output of "pmset -g batt" changed at some point from
"Currently drawing from 'AC Power'" to the slightly different
"Now drawing from 'AC Power'". Starting the match from "drawing"
makes the check work in both old and new versions of OS X.
Signed-off-by: Panagiotis Astithas
---
contrib/hooks/
On Thu, Jun 11, 2015 at 08:02:33PM +0700, Duy Nguyen wrote:
> > I see that do_fetch_pack checks server_supports("shallow"). Is that
> > enough to cover all fetch cases? And if it is, why does it not cover the
> > matching clone cases?
>
> I think this replacement check would do
>
> if ((args->de
On Thu, Jun 11, 2015 at 9:40 AM, Johannes Schindelin
wrote:
> Hi Michael,
>
> On 2015-06-11 03:30, Michael Rappazzo wrote:
>
>> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
>> index dc3133f..6d14315 100644
>> --- a/git-rebase--interactive.sh
>> +++ b/git-rebase--interactive
Hi Michael,
On 2015-06-11 03:30, Michael Rappazzo wrote:
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index dc3133f..6d14315 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -740,10 +740,19 @@ collapse_todo_ids() {
> # "pick sha1 fixup
On Sun, Jun 7, 2015 at 5:12 AM, Kevin Daudt wrote:
> From: Kevin Daudt
>
> rebase learned to stash changes when it encounters a dirty work tree, but
> git pull --rebase does not.
>
> Only verify if the working tree is dirty when rebase.autostash is not
> enabled.
>
> Signed-off-by: Kevin Daudt
On Sun, Jun 7, 2015 at 5:12 AM, Kevin Daudt wrote:
> @@ -278,25 +291,6 @@ test_expect_success 'rebased upstream + fetch + pull
> --rebase' '
>
> '
>
> -test_expect_success 'pull --rebase dies early with dirty working directory' '
> -
> - git checkout to-rebase &&
> - git update-ref r
On Thu, Jun 11, 2015 at 2:05 AM, Jeff King wrote:
> On Wed, Jun 10, 2015 at 02:35:20PM -0400, Mike Edgar wrote:
>
>> When the user passes --depth to git-clone the server's capabilities are
>> not currently consulted. The client will send shallow requests even if
>> the server does not understand t
From: "Simon A. Eugster"
Signed-off-by: Simon A. Eugster
---
Documentation/git-checkout.txt | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index d263a56..5c3ef86 100644
--- a/Documentation/git-checkout.txt
>
I agree, the word 'revert' is already taken for the operation of creating
a new commit which undoes some earlier commit. So 'revert' cannot be used
for the operation of overwriting a working tree file with its contents from
the repository.
But just because 'revert' is not a good choice, doesn't
A caller may wish to write a temporary index as a tree. However,
write_cache_as_tree() assumes that the index was read from, and will
write to, the default index file path. Introduce write_index_as_tree()
which removes this limitation by allowing the caller to specify its own
index_state and index
Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am
supported the --3way option, and if set, would attempt to do a 3-way
merge if the initial patch application fails. Re-implement this feature
through the fall_back_threeway() function.
Signed-off-by: Paul Tan
---
builtin/am.c
Implement applying the patch to the index using git-apply.
Signed-off-by: Paul Tan
---
builtin/am.c | 55 ++-
1 file changed, 54 insertions(+), 1 deletion(-)
diff --git a/builtin/am.c b/builtin/am.c
index a1db474..b725a74 100644
--- a/builtin/
Since ced9456 (Give the user a hint for how to continue in the case that
git-am fails because it requires user intervention, 2006-05-02), git-am
prints additional information on how the user can re-invoke git-am to
resume patch application after resolving the failure. Re-implement this
through the
Since 0e987a1 (am, rebase: teach quiet option, 2009-06-16), git-am
supported the --quiet option and GIT_QUIET environment variable, and
when told to be quiet, would only speak on failure. Re-implement this by
introducing the say() function, which works like fprintf_ln(), but would
only write to the
If a file is unchanged but stat-dirty, git-apply may erroneously fail to
apply patches, thinking that they conflict with a dirty working tree.
As such, since 2a6f08a (am: refresh the index at start and --resolved,
2011-08-15), git-am will refresh the index before applying patches.
Re-implement thi
Since 3e5057a (git am --abort, 2008-07-16), git-am supported the --abort
option that will rewind HEAD back to the original commit. Re-implement
this feature through am_abort().
Since 7b3b7e3 (am --abort: keep unrelated commits since the last failure
and warn, 2010-12-21), to prevent commits made s
Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am
supported the --signoff option which will append a signoff at the end of
the commit messsage. Re-implement this feature by calling
append_signoff() if the option is set.
Signed-off-by: Paul Tan
---
builtin/am.c | 13 +
Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am
will refuse to apply patches if the index is dirty. Re-implement this
behavior.
Signed-off-by: Paul Tan
---
builtin/am.c | 46 ++
1 file changed, 46 insertions(+)
diff --git a/buil
Since 0c15cc9 (git-am: --resolved., 2005-11-16), git-am supported
resuming from a failed patch application. The user will manually apply
the patch, and the run git am --resolved which will then commit the
resulting index. Re-implement this feature by introducing am_resolve().
Signed-off-by: Paul T
Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am
supported resuming from a failed patch application by skipping the
current patch. Re-implement this feature by introducing am_skip().
Signed-off-by: Paul Tan
---
builtin/am.c | 121
Implement do_commit(), which commits the index which contains the
results of applying the patch, along with the extracted commit message
and authorship information.
Signed-off-by: Paul Tan
---
builtin/am.c | 50 ++
1 file changed, 46 insertions(+),
For the purpose of rewriting git-am.sh into a C builtin, implement a
skeletal builtin/am.c that redirects to $GIT_EXEC_PATH/git-am if the
environment variable _GIT_USE_BUILTIN_AM is not defined. Since in the
Makefile git-am.sh takes precedence over builtin/am.c,
$GIT_EXEC_PATH/git-am will contain t
Since 15ced75 (git-am foreign patch support: autodetect some patch
formats, 2009-05-27), git-am.sh is able to autodetect mbox, stgit and
mercurial patches through heuristics.
Re-implement support for autodetecting mbox/maildir files.
Helped-by: Eric Sunshine
Signed-off-by: Paul Tan
---
Notes:
A common usage pattern of open() is to check if it was successful, and
die() if it was not:
int fd = open(path, O_WRONLY | O_CREAT, 0777);
if (fd < 0)
die_errno(_("Could not open '%s' for writing."), path);
Implement a wrapper function xopen() that does the above s
git-am applies a series of patches. If the process terminates
abnormally, we want to be able to resume applying the series of patches.
This requires the session state to be saved in a persistent location.
Implement the mechanism of a "patch queue", represented by 2 integers --
the index of the cur
A common usage pattern of fopen() is to check if it succeeded, and die()
if it failed:
FILE *fp = fopen(path, "w");
if (!fp)
die_errno(_("could not open '%s' for writing"), path);
Implement a wrapper function xfopen() for the above, so that we can save
a few lines
For the purpose of applying the patch and committing the results,
implement extracting the patch data, commit message and authorship from
an e-mail message using git-mailinfo.
git-mailinfo is run as a separate process, but ideally in the future,
we should be be able to access its functionality dir
git-am.sh supports mbox, stgit and mercurial patches. Re-implement
support for splitting out mbox/maildirs using git-mailsplit, while also
implementing the framework required to support other patch formats in
the future.
Re-implement support for the --patch-format option (since a5a6755
(git-am for
This is a re-roll of [v1]. Thanks Junio, Torsten, Jeff, Eric for the reviews
last round.
Previous versions:
[v1] http://thread.gmane.org/gmane.comp.version-control.git/270048
git-am is a commonly used command for applying a series of patches from a
mailbox to the current branch. Currently, it is
This is a re-roll of [v1]. Thanks Junio, Torsten, Jeff, Eric for the reviews
last round.
Previous versions:
[v1] http://thread.gmane.org/gmane.comp.version-control.git/270048
git-am is a commonly used command for applying a series of patches from a
mailbox to the current branch. Currently, it is
Junio C Hamano writes:
> Junio C Hamano writes:
>
>> +bisect_terms () {
>> +test $# -eq 2 ||
>> +die "You need to give me at least two arguments"
>> +
>> +if ! test -s "$GIT_DIR/BISECT_START"
>> +then
>> +echo $1 >"$GIT_DIR/BISECT_TERMS" &&
>> +echo $2 >>"
Junio C Hamano writes:
> Antoine Delaite writes:
>
>> -USAGE='[help|start|bad|good|new|old|skip|next|reset|visualize|replay|log|run]'
>> +USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|replay|log|run]'
>
> I think this patch makes the whole series go in the right direction.
On Wed, Jun 10, 2015 at 03:12:21PM +0200, Bossert, Andre wrote:
> Hello,
>
> i've tested "git difftool" with -t --ext-cmd and other options to see
> my diff with external tools, but it always show internal text-diff in
> console. The same tests with "git mergetool" working as expected. I've
> comp
97 matches
Mail list logo
