On Fri, Feb 21, 2014 at 06:58:16PM +0700, Duy Nguyen wrote:
--sort=[-][comparison:]field
[...]
Why not reversed order? So its syntax could be
[ - ] FIELD [ : [ version | v ] ]
It fits better to current f-e-r syntax where modifiers are after the
colon. And it avoids the possibility
On Sat, Feb 22, 2014 at 10:29:22AM +0700, Nguyễn Thái Ngọc Duy wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
The new prereq GNULINUX is an ugly workaround until people provide
strverscmp compat implementation. I hope that will happen soon as
strverscmp.c does not look
On Fri, Feb 21, 2014 at 10:09:33AM -0800, Junio C Hamano wrote:
This delta_stack array can grow to any length depending on the actual
delta chain, but we forget to free it. Normally it does not matter
because we use small_delta_stack[] from stack and small_delta_stack
can hold 64-delta
On Sat, Feb 22, 2014 at 03:09:20AM +0800, Tay Ray Chuan wrote:
In f3f47a1 (status: add --long output format option), STATUS_FORMAT_NONE
was introduced, meaning the user did not specify anything. Rename this
to *_DEFAULT to better indicate its meaning.
Hmm. We later introduced
On Sat, Feb 22, 2014 at 03:09:22AM +0800, Tay Ray Chuan wrote:
@@ -1141,7 +1146,12 @@ static int parse_and_validate_options(int argc, const
char *argv[],
if (all argc 0)
die(_(Paths with -a does not make sense.));
- if (status_format != STATUS_FORMAT_DEFAULT)
+
On Fri, Feb 21, 2014 at 12:21:13PM -0800, Junio C Hamano wrote:
Tay Ray Chuan rcta...@gmail.com writes:
In particular, show that --short and --porcelain, while implying
--dry-run, do not return the same exit code as --dry-run. This is due to
the wt_status.commitable flag being set only
On Wed, Feb 19, 2014 at 12:58:55AM +0200, Kirill A. Shutemov wrote:
The patch extends git config --file interface to allow read config from
stdin.
Editing stdin or setting value in stdin is an error.
Include by absolute path is allowed in stdin config, but not by relative
path.
Duy Nguyen pclo...@gmail.com writes:
OK with git://git.savannah.gnu.org/emacs.git we have
- a 209MB pack with --aggressive
- 1.3GB with --depth=50
- 1.3GB with --window=4000 --depth=32
- 1.3GB with --depth=20
- 821MB with --depth=250 for commits --before=2.years.ago, --depth=50
for
David Kastrup d...@gnu.org writes:
Duy Nguyen pclo...@gmail.com writes:
OK with git://git.savannah.gnu.org/emacs.git we have
- a 209MB pack with --aggressive
- 1.3GB with --depth=50
- 1.3GB with --window=4000 --depth=32
- 1.3GB with --depth=20
- 821MB with --depth=250 for commits
On Sat, Feb 22, 2014 at 2:59 PM, Jeff King p...@peff.net wrote:
On Fri, Feb 21, 2014 at 06:58:16PM +0700, Duy Nguyen wrote:
--sort=[-][comparison:]field
[...]
Why not reversed order? So its syntax could be
[ - ] FIELD [ : [ version | v ] ]
It fits better to current f-e-r syntax where
On Sat, Feb 22, 2014 at 3:53 PM, David Kastrup d...@gnu.org wrote:
David Kastrup d...@gnu.org writes:
Duy Nguyen pclo...@gmail.com writes:
OK with git://git.savannah.gnu.org/emacs.git we have
- a 209MB pack with --aggressive
- 1.3GB with --depth=50
- 1.3GB with --window=4000 --depth=32
This is the second iteration of
http://thread.gmane.org/gmane.comp.version-control.git/241565
Changes since the last version:
* Dropped patches 4 and 5 (log --merge-bases)
* Implemented the full-file conflict scheme explained in the
previous cover letter: if the conflicted version is
The directory hash (for fast checks if the index already has a
directory) was only used in ignore_case mode and so depended on that
flag.
Make it generally available on request.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
cache.h | 2 ++
name-hash.c | 19 ---
2 files
The four ways of displaying merge diffs,
* none: no diff
* -m: against each parent
* -c: combined
* --cc: combined-condensed
were encoded in three flag bits in struct rev_info. Fold them all
into a single enum field that captures the variants.
This makes it easier to add new merge diff
From: Thomas Rast tr...@inf.ethz.ch
650467c (merge-recursive: Consolidate different update_stages
functions, 2011-08-11) changed the former argument 'clear' to always
be true. Remove the useless conditional.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
Signed-off-by: Junio C Hamano
From: Thomas Rast tr...@inf.ethz.ch
o-call_depth has a double function: a nonzero call_depth means we
want to construct virtual merge bases, but it also means we want to
avoid touching the worktree. Introduce a new flag o-no_worktree to
trigger only the latter.
Signed-off-by: Thomas Rast
Add a --conflicts-in-index option to merge-recursive, which instructs
it to always store the 3-way merged result in the index. (Normally it
only does so in recursive invocations, but not for the final result.)
This serves as a building block for the remerge diff feature coming
up in a subsequent
From: Thomas Rast tr...@inf.ethz.ch
Using the new no_worktree flag from the previous commit, we can teach
merge-recursive to leave the worktree untouched. Expose this with a
new strategy option so that scripts can use it.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
David Kastrup d...@gnu.org writes:
That does look strange: Emacs has a history of more than 30 years. But
the Git mirror is quite younger. Maybe one needs to make sure to use
the author date rather than the commit date here?
There is no difference between commit and author date in the Emacs
Junio C Hamano gits...@pobox.com writes:
Thomas Rast t...@thomasrast.ch writes:
@@ -2845,8 +2845,9 @@ static struct diff_tempfile *prepare_temp_file(const
char *name,
remove_tempfile_installed = 1;
}
-if (!one-sha1_valid ||
-reuse_worktree_file(name,
Hello,
I am Mrs. Supini Thrunkul from Tai Yau Bank Hong Kong, I need your cooperation
to transfer $ 47.3 million US Dollars to any trusted account within your
control.
Contact me for more details.
Mrs. Supini Thrunkul
Tel: +85 2580 848 65
--
To unsubscribe from this list: send the line
On Sat, Feb 22, 2014 at 4:14 PM, Duy Nguyen pclo...@gmail.com wrote:
On Sat, Feb 22, 2014 at 3:53 PM, David Kastrup d...@gnu.org wrote:
David Kastrup d...@gnu.org writes:
Duy Nguyen pclo...@gmail.com writes:
OK with git://git.savannah.gnu.org/emacs.git we have
- a 209MB pack with
Junio C Hamano gits...@pobox.com writes:
Jeff King p...@peff.net writes:
On Fri, Feb 21, 2014 at 06:47:47AM +0700, Nguyễn Thái Ngọc Duy wrote:
This delta_stack array can grow to any length depending on the actual
delta chain, but we forget to free it. Normally it does not matter
because we
---
builtin/blame.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index e44a6bb..96716dd 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -939,7 +939,6 @@ static void find_copy_in_blob(struct scoreboard *sb,
The region end can be looked up just like its beginning.
Signed-off-by: David Kastrup d...@gnu.org
---
builtin/blame.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index e44a6bb..96716dd 100644
--- a/builtin/blame.c
+++
David Kastrup d...@gnu.org writes:
Oh, good grief. Forgot to sign off, and on rereading, the commit
message is clearly subfabulous. So forget this one. The content is
fine, though.
--
David Kastrup
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Jeff King p...@peff.net writes:
On Mon, Feb 17, 2014 at 03:12:48PM -0500, Murtuza Mukadam wrote:
We have linked peer review discussions on
git@vger.kernel.org to their respective commits within the main
git.git repository. You can view the linked reviews from 2012
until present in the
Nguy?n Thái Ng?c Duy:
I can't think of any case that progress lines are for machine. It
started because of the only local untranslated line in git clone.
But I think we should do all at once.
Indeed, a good move. Anything that is to be displayed to the end user
should be subject to
Presently if you want to perform a sparse checkout, you must either do a
full clone and then recheckout, or do a git init, manually set up
sparse, and then fetch and checkout.
This patch implements easily accessible sparse checkouts during clone,
in the --sparse-checkout option.
$ git clone REPO
(Digging up an old thread about initial refs listing in git protocol)
On Thu, Feb 7, 2013 at 7:12 AM, Junio C Hamano gits...@pobox.com wrote:
Ævar Arnfjörð Bjarmason ava...@gmail.com writes:
I think there's a simpler way to do this, which is that:
* New clients supporting v2 of the protocol
On Sun, Feb 23, 2014 at 9:31 AM, Robin H. Johnson robb...@gentoo.org wrote:
Presently if you want to perform a sparse checkout, you must either do a
full clone and then recheckout, or do a git init, manually set up
sparse, and then fetch and checkout.
I think you could do clone -n (no
On Sun, Feb 23, 2014 at 09:52:16AM +0700, Duy Nguyen wrote:
On Sun, Feb 23, 2014 at 9:31 AM, Robin H. Johnson robb...@gentoo.org wrote:
Presently if you want to perform a sparse checkout, you must either do a
full clone and then recheckout, or do a git init, manually set up
sparse, and
32 matches
Mail list logo
