Maybe something along the lines of a git-subtree merge. I am not sure
how to do that exactly, and I am not sure that it would be worth the
trouble to setup for a small case...
On Tue, Aug 18, 2015 at 1:11 PM, Anish Tondwalkar
wrote:
> I stashed some changes, then refactored my code to move the fu
Dear Invited Author,
If August 25 is too early for you to upload your invited paper in our
conferences in Seoul, South Korea, you must know
that we have also conferences in Michigan State University, East Lansing, MI,
September 20-22, 2015
and we would like to invite you to come as Invited Spea
`module_clone` is part of the update command, which I want to convert
to C next.
Signed-off-by: Stefan Beller
---
This is the only patch that broke by a last minute fix,
so this replaces the previous PATCH 7/7.
builtin/submodule--helper.c | 161 +++-
git
I stashed some changes, then refactored my code to move the function
they're in into a new file. Now, I want to apply it to the new file. I
know git can figure out this relationship between the files, because
`git blame -C -C` can find it, but is there a "more idiomatic" way to
apply this diff than
This needs to be squashed in:
diff --git a/Documentation/git-for-each-ref.txt
b/Documentation/git-for-each-ref.txt
index fe7889c..0a89f29 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -129,7 +129,7 @@ color::
align::
Left-, middle-, or right-
On Wed, Aug 19, 2015 at 12:48 AM, Eric Sunshine wrote:
> On Tue, Aug 18, 2015 at 2:37 PM, Karthik Nayak wrote:
>> Version 11 was posted here:
>> http://article.gmane.org/gmane.comp.version-control.git/275997
>>
>> Changes in this version:
>> * Small style and formatting changes.
>> * Remove unnec
On Tue, Aug 18, 2015 at 2:37 PM, Karthik Nayak wrote:
> Version 11 was posted here:
> http://article.gmane.org/gmane.comp.version-control.git/275997
>
> Changes in this version:
> * Small style and formatting changes.
> * Remove unnecessary variable from push_new_state().
> * pop_state doesn't ret
Make 'branch.c' use 'ref-filter' data structures and make changes to
support the new data structures. This is a part of the process of
porting 'branch.c' to use 'ref-filter' APIs.
This is a temporary step before porting 'branch.c' to use 'ref-filter'
completely. As this is a temporary step, most o
Add the '--points-at' option provided by 'ref-filter'. The option lets
the user to list only branches which points at the given object.
Add documentation and tests for the same.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
Documentation/git-branch.t
Make 'branch.c' use 'ref-filter' APIs for iterating through refs
sorting. This removes most of the code used in 'branch.c' replacing it
with calls to the 'ref-filter' library.
Make 'branch.c' use the 'filter_refs()' function provided by 'ref-filter'
to filter out tags based on the options set.
We
Remove the error reporting variable to make the code easier to port
over to using ref-filter APIs. This variable is not require as in
ref-filter we already check for possible errors and report them.
Based-on-patch-by: Jeff King
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-
Remove show_detached() and make detached HEAD to be rolled into
regular ref_list by adding REF_DETACHED_HEAD as a kind of branch and
supporting the same in append_ref(). This eliminates the need for an
extra function and helps in easier porting of branch.c to use
ref-filter APIs.
Before show_detac
This is part of my GSoC project to "unify the code of tag -l, branch,
and for-each-ref".
Version 1 can be found here:
http://thread.gmane.org/gmane.comp.version-control.git/275264
Changes:
* The filtering of refs based on type has been moved over to the
series of porting tag.c to ref-filter.
* 1
This is a preperatory patch for 'roll show_detached HEAD into regular
ref_list'. This patch moves get_head_description() to the top so that
it can be used in print_ref_item().
Based-on-patch-by: Jeff King
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
From: Karthik Nayak
Remove unnecessary variables from ref_list and ref_item which were
used for width computation. This is to make ref_item similar to
ref-filter's ref_array_item. This will ensure a smooth port of
branch.c to use ref-filter APIs in further patches.
Previously the maxwidth was co
We check if given ref is the current branch in print_ref_list(). Move
this check to print_ref_item() where it is checked right before
printing.
Based-on-patch-by: Jeff King
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
builtin/branch.c | 22 +
From: Karthik Nayak
Use 'ref-filter' APIs to implement the '--merged' and '--no-merged'
options into 'tag.c'. The '--merged' option lets the user to only list
tags merged into the named commit. The '--no-merged' option lets the
user to only list tags not merged into the named commit. If no objec
From: Karthik Nayak
Since 'ref-filter' only has an option to match path names add an
option for plain fnmatch pattern-matching.
This is to support the pattern matching options which are used in `git
tag -l` and `git branch -l` where we can match patterns like `git tag
-l foo*` which would match
From: Karthik Nayak
Make 'tag.c' use 'ref-filter' APIs for iterating through refs, sorting
and printing of refs. This removes most of the code used in 'tag.c'
replacing it with calls to the 'ref-filter' library.
Make 'tag.c' use the 'filter_refs()' function provided by 'ref-filter'
to filter out
From: Karthik Nayak
Add a function called 'for_each_reftype_fullpath()' to refs.{c,h}
which iterates through each ref for the given path without trimming
the path and also accounting for broken refs, if mentioned.
Add 'filter_ref_kind()' in ref-filter.c to check the kind of ref being
handled and
From: Karthik Nayak
Implement the '--format' option provided by 'ref-filter'.
This lets the user list tags as per desired format similar
to the implementation in 'git for-each-ref'.
Add tests and documentation for the same.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by
From: Karthik Nayak
Make 'tag.c' use 'ref-filter' data structures and make changes to
support the new data structures. This is a part of the process
of porting 'tag.c' to use 'ref-filter' APIs.
This is a temporary step before porting 'tag.c' to use 'ref-filter'
completely. As this is a temporary
From: Karthik Nayak
In 'tag.c' we can print N lines from the annotation of the tag using
the '-n' option. Copy code from 'tag.c' to 'ref-filter' and
modify 'ref-filter' to support printing of N lines from the annotation
of tags.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-of
From: Karthik Nayak
Add support to sort by version using the "v:refname" and
"version:refname" option. This is achieved by using the 'versioncmp()'
function as the comparing function for qsort.
This option is included to support sorting by versions in `git tag -l`
which will eventually be ported
Since atom_value is only required for the internal working of
ref-filter it doesn't belong in the public header.
Helped-by: Eric Sunshine
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
ref-filter.c | 5 +
ref-filter.h | 5 +
2 files changed, 6
Implement an `align` atom which left-, middle-, or right-aligns the
content between %(align:..) and %(end).
It is followed by `:,`, where the `` is
either left, right or middle and `` is the size of the area
into which the content will be placed. If the content between
%(align:) and %(end) is more
This is part of my GSoC project to "unify the code used by branch -l,
tag -l, and for-each-ref". This series ports over tag.c to use ref-filter
APIs.
Version 11 was posted here:
http://article.gmane.org/gmane.comp.version-control.git/275997
Changes in this version:
* Small style and formatting c
Introduce ref_formatting_state which will hold the formatted output
strbuf instead of directly printing to stdout. This will help us in
creating modifier atoms which modify the format specified before
printing to stdout.
Rename some functions to reflect the changes made:
print_value() -> append_at
Add strbuf_utf8_align() which will align a given string into a strbuf
as per given align_type and width. If the width is greater than the
string length then no alignment is performed.
Helped-by: Eric Sunshine
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
Introduce a stack machinery for ref_formatting_state, this allows us
to push and pop states. Whenever we pop a state the strbuf from that
state is appended into the next state on the stack, this will allow us
to support nesting of modifier atoms.
Mentored-by: Christian Couder
Mentored-by: Matthie
> Eric Sunshine sunshineco.com> writes:
>
> Hmm, I was under the impression from your initial mail[1] that Git
> wouldn't even build without Perl available:
>
> /bin/sh: /usr/bin/perl: not found
> Makefile:1701: recipe for target 'common-cmds.h' failed
> gmake[2]: *** [common-cmds.h]
Signed-off-by: Thomas Ackermann
---
Documentation/RelNotes/2.6.0.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/RelNotes/2.6.0.txt b/Documentation/RelNotes/2.6.0.txt
index 4a0a589..e86de81 100644
--- a/Documentation/RelNotes/2.6.0.txt
+++ b/Documentation/Re
On Tue, Aug 18, 2015 at 7:05 AM, Renato Botelho wrote:
> Eric Sunshine sunshineco.com> writes:
>> On Fri, Aug 14, 2015 at 6:22 PM, Junio C Hamano pobox.com>
> wrote:
>> > Eric Sunshine sunshineco.com> writes:
>> >> On Fri, Aug 14, 2015 at 5:02 PM, Junio C Hamano
> pobox.com> wrote:
>> >>> Eric
Dear Git (for Windows) users,
it is my great pleasure to announce the first official version of Git for
Windows. We finally have caught up with Git 2.x and are ready to leave the
-preview suffix behind (more on that below).
It is available at https://git-for-windows.github.io/ and also at
https:
Hi Adam,
On 2015-08-09 19:05, Adam Dinwoodie wrote:
> On 09/08/2015 10:01, Johannes Schindelin wrote:
>> On 2015-08-09 04:01, Adam Dinwoodie wrote:
>>>
We've gotten a lot of users on the list who ask why their Git
directories on shared drives aren't working (or are broken in some way).
Hi,
I had an idea how to deal with tracking empty directories in git repositories
when one does not want ".gitkeep" files. Just add a trailer like:
empty-dirs: a b/c a\nnewline exploit\" &&\ rm\ -rf \/ ..
this line would indicate that the worktree contained the empty directories a
and b/c and
From: Brilliantov Kirill Vladimirovich
Signed-off-by: Brilliantov Kirill Vladimirovich
---
archive-tar.c| 15 +--
archive-zip.c| 7 +--
archive.c| 3 ++-
builtin/add.c| 3 ++-
builtin/am.c | 8 +---
builtin/apply.c | 6 ++
Eric Sunshine sunshineco.com> writes:
>
> On Fri, Aug 14, 2015 at 6:22 PM, Junio C Hamano pobox.com>
wrote:
> > Eric Sunshine sunshineco.com> writes:
> >
> >> On Fri, Aug 14, 2015 at 5:02 PM, Junio C Hamano
pobox.com> wrote:
> >>> Eric Sunshine sunshineco.com> writes:
> >>>
> >>> I do not th
On 64 bit linux, sizeof (struct index_state) = 160 and sizeof (struct
packed_git) = 104. This change shrinks the structs with 8bytes (as it
avoids padding)
Signed-off-by: Дилян Палаузов
---
diff --git a/cache.h b/cache.h
index 6bb7119..e00908b 100644
--- a/cache.h
+++ b/cache.h
@@ -310,11 +31
Paul Tan writes:
> From: Remi Lespinet
>
> Add the am.threeWay configuration variable to use the -3 or --3way
> option of git am by default. When am.threeway is set and not desired
> for a specific git am command, the --no-3way option can be used to
> override it.
>
> Signed-off-by: Remi Lespine
Sehr geehrter Post Bank Kunde,
Bitte beachten Sie, dass Ihr online-Banking-Zugang bald ablaeuft. Um diesen
Dienst weiterhin nutzen zu koennen, klicken Sie bitte auf den untenstehenden
Link um Ihren Zugang manuell mit unserem Sicherheits-Update zu aktualisieren.
http://5stardreamtrips.com/post-
Sehr geehrter Post Bank Kunde,
Bitte beachten Sie, dass Ihr online-Banking-Zugang bald ablaeuft. Um diesen
Dienst weiterhin nutzen zu koennen, klicken Sie bitte auf den untenstehenden
Link um Ihren Zugang manuell mit unserem Sicherheits-Update zu aktualisieren.
http://5stardreamtrips.com/post
42 matches
Mail list logo
