Jonathan Nieder jrnie...@gmail.com writes:
Stefano Lattarini wrote:
Why not encourage the use of a standardized '--action' option instead?
Because it's an unpleasant UI. :)
This can work with lesser compatibility headaches for both the commands
taking mode options and the commands taking
Hi, all.
* Background
Such a requirement came into my mind when I am tracking a gloomy C
struct , with lengthy list of elements which are either elaborated or
opaque. So I use git blame to track it down and found that its
original version is quite simple and intuitive. So I think I could
just
A while has passed since contrib/credential/netrc was added. Is it OK to
promote it to be part of the main installation? In that directory
there's also gnome-keyring, osxkeychain, and wincred; I don't know if
those are ready for promotion.
Thanks
Ted
--
To unsubscribe from this list: send the
Am 16.08.2013 00:36, schrieb Junio C Hamano:
Due to unfortunate regressions, two topics had to be reverted:
* An attempted fix to git stash save, to detect that going back
to the state of the HEAD needs to lose killed files, and/or
untracked files in a killed directory, to prevent the
Hi Thomas,
On Wed, Jul 31, 2013 at 03:17:41PM +0200, Thomas Rast wrote:
Jens Lehmann jens.lehm...@web.de writes:
Am 29.07.2013 21:37, schrieb Thomas Rast:
Thomas Rast tr...@inf.ethz.ch writes:
Thomas Rast tr...@inf.ethz.ch writes:
Now that git log -L has hit master, I figure it's
On 08/17/2013 03:34 PM, René Scharfe wrote:
Hmm, stepping back a bit, why not just build the paths and call unlink
for them right away, without readdir? The shell version only ever
deletes existing .pack files (those in $existing alias existing_packs)
as well as their .idx and .keep files,
This is the beginning of the rewrite of the repacking.
* replace all plain string handling functions
by git helper functions, most often mkpathdup
* use argv-array structs to pass arguments to
other git invocations.
Only test t7701 (2nd) fails now with this patch.
Signed-off-by: Stefan
gits...@pobox.com wrote on Tue, 13 Aug 2013 15:06 -0700:
* ks/p4-view-spec (2013-08-11) 3 commits
- WAITING FOR ACK
- git p4: implement view spec wildcards with p4 where
- git p4 test: sanitize P4CHARSET
Waiting for an ack.
I'm still running perf tests on the 3-patch version. It
looks
On Aug 18, 2013, at 07:36, Stefan Beller wrote:
+ fprintf(stderr,
+ WARNING: Some packs in use have been renamed
by\n
+ WARNING: prefixing old- to their name, in order
to\n
+
+static void remove_temporary_files() {
+ DIR *dir;
+ struct dirent *e;
+ char *prefix, *path;
+
+ prefix = mkpathdup(.tmp-%d-pack, getpid());
+ path = mkpathdup(%s/pack, get_object_directory());
+
+ dir = opendir(path);
+ while ((e = readdir(dir)) != NULL) {
This is a reroll of [1] which fixes a couple cases where rebase -i
ignores core.commentchar. One case was an oversight from the original
patch which added core.commentchar support to rebase -i, and is already
in 'maint'. The other is a regression introduced by [2] which is still
in 'next'.
In
I have a business deal to discuss with you please get back to me for more info.
Josh Brandon
--
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
9a46c25bdbf79744 (rebase: interactive: fix short SHA-1 collision,
2013-08-12) added transform_todo_ids() which assumes incorrectly that
the comment character is always '#', however, this has not been the case
since 180bad3d10fe3a7f (rebase -i: respect core.commentchar, 2013-02-11)
patched rebase
eff80a9fd990de36 (Allow custom comment char, 2013-01-16) added general
core.commentchar support but forgot to update git-rebase--interactive to
respect it. 180bad3d10fe3a7f (rebase -i: respect core.commentchar,
2013-02-11) addressed this oversight but missed one instance of
hard-coded '#' comment
When git submodule summary is run and there is a deleted submodule, there is an
warning from git rev-parse:
fatal: Not a git repository: '.vim/pathogen/.git'
Silence this warning, since it is fully expected that a deleted submodule will
not be a git repository.
Signed-off-by: brian m. carlson
Michael Haggerty mhag...@alum.mit.edu writes:
On 07/15/2013 11:43 PM, Junio C Hamano wrote:
[...]
This was a good exercise for git-imerge.[...]
A few things I noticed:
[...]
- The final step imerge finish gave me this ugliness:
Merge commit 93d9353... into commit cb5d2fc7
Hi,
previous rounds (without api) are at $gmane/202752, $gmane/202923,
$gmane/203088 and $gmane/203517, the previous rounds with api were at
$gmane/229732 and $gmane/230210. Thanks to Duy for reviewing the the
last round and Junio and Ramsay for additional comments.
Changes since the previous
Cygwin doesn't have uid, gid and ino stats fields. Therefore we should
never check them in the match_stat_data when working on the CYGWIN
platform.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
This patch was not tested on Cygwin yet. I think it's needed though,
because the
Move index version 2 specific functions to their own file. The non-index
specific functions will be in read-cache.c, while the index version 2
specific functions will be in read-cache-v2.c.
Helped-by: Nguyen Thai Ngoc Duy pclo...@gmail.com
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
Split index file version specific functionality to their own functions,
to prepare for moving the index file version specific parts to their own
file. This makes it easier to add a new index file format later.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
read-cache.c | 114
All fields except index_state-version are reset in discard_index.
Reset the version too.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
read-cache.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/read-cache.c b/read-cache.c
index de0bbcd..1e22f6f 100644
--- a/read-cache.c
+++
t2104 currently checks for the exact index version 2 or 3,
depending if there is a skip-worktree flag or not. Other
index versions do not use extended flags and thus cannot
be tested for version changes.
Make this test update the index to version 2 at the beginning
of the test. Testing the
Use the fixed width integer types uint16_t and uint32_t for ondisk
structures, because unsigned short and unsigned int do not hae a
guaranteed size.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
cache.h | 10 +-
read-cache.c | 30 +++---
2 files
Respect a GIT_INDEX_VERSION environment variable, when a new index is
initialized. Setting the environment variable will not cause existing
index files to be converted to another format for additional safety.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
read-cache.c | 9 +++--
1
Write the index version 5 file format to disk. This version doesn't
write the cache-tree data and resolve-undo data to the file.
The main work is done when filtering out the directories from the
current in-memory format, where in the same turn also the conflicts
and the file data is calculated.
From: Thomas Rast tr...@inf.ethz.ch
Add a performance test for index version [23]/4/5 by using
git update-index --index-version=x, thus testing both the reader
and the writer speed of all index formats.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
Signed-off-by: Thomas Gummerer
A partially read index file currently cannot be written to disk. Make
sure that never happens, by erroring out when a caller tries to write a
partially read index. Do the same when trying to re-read a partially
read index without having discarded it first to avoid loosing any
information.
Add the possibility of re-reading the index file, if it changed
while reading.
The index file might change during the read, causing outdated
information to be displayed. We check if the index file changed
by using its stat data as heuristic.
Helped-by: Ramsay Jones ram...@ramsay1.demon.co.uk
Add a documentation of the index file format version 5 to
Documentation/technical.
Helped-by: Michael Haggerty mhag...@alum.mit.edu
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Thomas Rast tr...@student.ethz.ch
Helped-by: Nguyen Thai Ngoc Duy pclo...@gmail.com
Helped-by: Robin Rosenberg
Write the cache-tree data for the index version 5 file format. The
in-memory cache-tree data is converted to the ondisk format, by adding
it to the directory entries, that were compiled from the cache-entries
in the step before.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
Make git read the index file version 5 without complaining.
This version of the reader doesn't read neither the cache-tree
nor the resolve undo data, but doesn't choke on an index that
includes such data.
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Nguyen Thai Ngoc Duy
Make git read the resolve-undo data from the index.
Since the resolve-undo data is joined with the conflicts in
the ondisk format of the index file version 5, conflicts and
resolved data is read at the same time, and the resolve-undo
data is then converted to the in-memory format.
Helped-by:
Add documentation for the index reading api. This also includes
documentation for the new api functions introduced in the next patch.
Helped-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
Documentation/technical/api-in-core-index.txt | 54
Jiang Xin worldhello@gmail.com writes:
Changes since v6:
* s/broken/gone/ in [PATCH 2/3] (branch: mark missing tracking branch
as gone)
* rewrite commit log for [PATCH 3/3] (status: always show tracking
branch even no change)
Jiang Xin (3):
branch: not report invalid tracking
Eric Sunshine sunsh...@sunshineco.com writes:
One of the fixes in this patch addresses an oversight in
180bad3d10fe3a7f (rebase -i: respect core.commentchar, 2013-02-11)
which is already in 'maint'. Should I split this patch in two so that
the one fix can be applied to 'maint'?
We are so
On Sun, Aug 18, 2013 at 4:29 PM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
One of the fixes in this patch addresses an oversight in
180bad3d10fe3a7f (rebase -i: respect core.commentchar, 2013-02-11)
which is already in 'maint'. Should I split this
On Aug 18, 2013, at 3:41 PM, Thomas Gummerer wrote:
Add documentation for the index reading api. This also includes
documentation for the new api functions introduced in the next patch.
Helped-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
On Sun, Aug 18, 2013 at 3:41 PM, Thomas Gummerer t.gumme...@gmail.com wrote:
A partially read index file currently cannot be written to disk. Make
sure that never happens, by erroring out when a caller tries to write a
s/,//
partially read index. Do the same when trying to re-read a
Eric Sunshine sunsh...@sunshineco.com writes:
Intended for 'next'.
Thanks.
Will queue on top of es/rebase-i-no-abbrev, but we have a chance to
rebuild 'next' after 1.8.4 release, so we may want to squash this
into the problematic commit when it happens.
git-rebase--interactive.sh | 2 +-
Mattias Andrée maand...@member.fsf.org writes:
This patch allows you to an automated by section
by just like if it was a manual, i.e. stating
with `git bisect start git bisect bad
git bisect good commit` but then type:
while ! git bisect state; do
test command git bisect good || git
This is the beginning of the rewrite of the repacking.
* rename get_pack_sha1_list to get_pack_filename_list, which
* reads the pack directory only once as suggested by Rene.
* fix the grammar as suggested by Kyle.
All tests have been positive at least once now.
However there is still one
On 18/08/2013 08:41 PM, Thomas Gummerer wrote:
Cygwin doesn't have uid, gid and ino stats fields. Therefore we should
never check them in the match_stat_data when working on the CYGWIN
platform.
Hmm, this is simply not true ... ;-)
The need to omit the uid, gid and ino fields from the stat
On Sun, Aug 18, 2013 at 3:42 PM, Thomas Gummerer t.gumme...@gmail.com wrote:
Make git read the index file version 5 without complaining.
This version of the reader doesn't read neither the cache-tree
nor the resolve undo data, but doesn't choke on an index that
includes such data.
The
On Sun, Aug 18, 2013 at 6:33 PM, Zhan Jianyu nasa4...@gmail.com wrote:
Such a requirement came into my mind when I am tracking a gloomy C
struct , with lengthy list of elements which are either elaborated or
opaque. So I use git blame to track it down and found that its
original version is
44 matches
Mail list logo
