The updates are only holding refs not reflogs, so express it to the reader.
Signed-off-by: Stefan Beller
---
* only renaming, no extra code in this patch.
* new to the series.
refs.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/refs.c b/refs.c
index f0f0d2
When performing a reflog transaction update, only write to the reflog iff
msg is non-NULL. This can then be combined with REFLOG_TRUNCATE to perform
an update that only truncates but does not write. This change only affects
whether or not a reflog entry should be generated and written. If msg == NU
From: Ronnie Sahlberg
Use a transaction for all updates during expire_reflog.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: Stefan Beller
---
no changes since sending it 5 days ago.
builtin/reflog.c | 86
1 file changed, 37 insertions
From: Ronnie Sahlberg
Rename the transaction functions. Remove the leading ref_ from the
names and append _ref to the names for functions that create/delete/
update sha1 refs.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: Stefan Beller
---
This commit can be reproduced via
find . -name "*.[ch]
This is the core part of the refs-transactions-reflog series[1],
which was in discussion for a bit already.
The idea is to have the reflog being part of the transactions, which
the refs are already using, so the we're moving towards a database
like API in the long run. This makes git easier to mai
On Mon, Dec 01, 2014 at 05:17:22AM +0100, Christian Couder wrote:
> On Mon, Dec 1, 2014 at 4:04 AM, Junio C Hamano wrote:
> >
> > If I were redoing this today, I would probably nominate the "git"
> > potty as such a "kitchen synk" command. We have "--man-path" that
> > shows the location of the
On Sun, Nov 30, 2014 at 12:54:53PM +1100, Bryan Turner wrote:
> I'll let someone a little more intimately familiar with the internals
> of git status comment on why the documentation for that mentions
> copies.
I don't think there is a good reason. git-status has used renames since
mid-2005. The
Hi Jonathan,
Am 02.12.14 00:35, schrieb Jonathan Nieder:
> Christoph Mallon wrote:
>> % git rev-parse 'master@{52}'
>> warning: Log for ref refs/heads/master has gap after Thu, 1 Jan 1970
>> 00:00:01 +.
>> 0036
>
> Can you say more? What output did you ex
On Tue, Dec 02, 2014 at 04:47:50PM +1100, Bryan Turner wrote:
> > There is a practical reason to care. Ref deletion will also delete the
> > reflog, leaving no trace of the reachability. Whereas a non-fast-forward
> > push could be resolved by looking in the reflog.
>
> A fair point. I had mistak
On Tue, Dec 2, 2014 at 4:33 PM, Jeff King wrote:
> On Tue, Dec 02, 2014 at 04:04:11PM +1100, Bryan Turner wrote:
>
>> > Can you say more about the context? For example, was this actually
>> > happening, or is this for the sake of understanding the protocol
>> > better?
>>
>> I ask because it's ac
On Sun, Nov 30, 2014 at 03:55:48PM +0700, Nguyễn Thái Ngọc Duy wrote:
> This is something else that's been sitting in my tree for a while now.
> It adds "git list-files", intended to be aliased as "ls" with your
> favourite display options.
When I read the subject, I thought "why isn't this calle
On Tue, Dec 2, 2014 at 12:17 PM, Jonathan Nieder wrote:
>> I'm trying to decide if there is something I can enable or tune to
>> prevent it, and the type of twilighting hinted at by the http-protocol
>> documentation seemed like it could be just the thing.
>
> If you control the side that clones,
On Tue, Dec 02, 2014 at 04:04:11PM +1100, Bryan Turner wrote:
> > Can you say more about the context? For example, was this actually
> > happening, or is this for the sake of understanding the protocol
> > better?
>
> I ask because it's actually happening. Heavy CI load sometimes has
> builds fa
On Tue, Dec 2, 2014 at 12:17 PM, Jonathan Nieder wrote:
> On the server side, I agree that either mining reflogs or storing
> advertisements to disk would be a nice way to take care of this.
> No one has implemented either of those, but it would be a nice setting
> to have. :)
and could be danger
Bryan Turner wrote:
> I ask because it's actually happening. Heavy CI load sometimes has
> builds fail because git clone dies with "not our ref". That's the
> specific context I'm working to try and address right now.
Thanks --- that makes sense.
>
On 12/01/2014 12:39 PM, Junio C Hamano wrote:
Sorry, what is a hic? If this were an existing feature like
git-new-workdir, even though it is from contrib, making it impossible
to do something that used to be possible, even if that something is
what mere mortals would never want to to to avoid r
On Tue, Dec 2, 2014 at 3:45 PM, Jonathan Nieder wrote:
> Hi,
>
> Bryan Turner wrote:
>
>> The reason I ask is that there is a race condition that exists where
>> the ref advertisement lists refs/heads/foo at abc1234, and then foo is
>> deleted before the actual upload-pack request comes in.
>
> Ca
Hi,
Bryan Turner wrote:
> The reason I ask is that there is a race condition that exists where
> the ref advertisement lists refs/heads/foo at abc1234, and then foo is
> deleted before the actual upload-pack request comes in.
Can you say more about the context? For example, was this actually
ha
On Tue, Dec 2, 2014 at 3:28 PM, Bryan Turner wrote:
> On Tue, Dec 2, 2014 at 2:34 PM, Jonathan Nieder wrote:
>> Hi Bryan,
>>
>> Bryan Turner wrote:
>>
>>> Is there actually logic somewhere in Git that does that "MAY walk
>>> backwards" step?
>>
>> Yes. See upload-pack.c::check_non_tip and
>> htt
On Tue, Dec 2, 2014 at 2:34 PM, Jonathan Nieder wrote:
> Hi Bryan,
>
> Bryan Turner wrote:
>
>> Is there actually logic somewhere in Git that does that "MAY walk
>> backwards" step?
>
> Yes. See upload-pack.c::check_non_tip and
> http://thread.gmane.org/gmane.comp.version-control.git/178814.
Jon
Hi Bryan,
Bryan Turner wrote:
> Is there actually logic somewhere in Git that does that "MAY walk
> backwards" step?
Yes. See upload-pack.c::check_non_tip and
http://thread.gmane.org/gmane.comp.version-control.git/178814.
Hope that helps,
Jonathan
--
To unsubscribe from this list: send the lin
When receive.denyCurrentBranch is set to updateInstead, this hook
can be used to override the built-in "push-to-deploy" logic, which
insists that the working tree and the index must be unchanged
relative to HEAD. The hook receives the commit with which the
tip of the current is going to be updated
Junio C Hamano writes:
>> And thinking about the names again, I have a feeling that
>> updateInstead and mergeInstead are both probably misnomer.
>
> Let me take this part back. After all, I do not think I would
> design the mechanism to implement an alternative logic that decides
> when it is s
On Sunday, November 30, 2014, Nguyễn Thái Ngọc Duy wrote:
>
> This is more user friendly version of ls-files:
>
> * it's automatically colored and columnized
> * it refreshes the index like all porcelain commands
> * it defaults to non-recursive behavior like ls
> * :(glob) is on by default so '*.
In Documentation/technical/http-protocol.txt, there is the following statement:
"S: Parse the git-upload-pack request:
Verify all objects in `want` are directly reachable from refs.
The server MAY walk backwards through history or through
the reflog to permit slightly stale requests."
Is there
This patch series is not really ready for public digestion, I messed
up sending it to the list anyway.
Please ignore this series.
--
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/ma
From: Ronnie Sahlberg
Rename the transaction functions. Remove the leading ref_ from the
names and append _ref to the names for functions that create/delete/
update sha1 refs.
todo(sbeller): notes below 3 dashes
This commit can be reproduced via
find . -name "*.[ch]" -print | xargs sed -i ' \
From: Ronnie Sahlberg
Use a transaction for all updates during expire_reflog.
Change-Id: Ieb81b2660cefeeecf0bcb3cdbc1ef3cbb86e7eb8
Signed-off-by: Ronnie Sahlberg
Signed-off-by: Jonathan Nieder
Signed-off-by: Stefan Beller
---
builtin/reflog.c | 85
When performing a reflog transaction update, only write to the reflog iff
msg is non-NULL. This can then be combined with REFLOG_TRUNCATE to perform
an update that only truncates but does not write. This change only affects
whether or not a reflog entry should be generated and written. If msg == NU
The updates are only holding refs not reflogs, so express it to the reader.
Change-Id: Ifdc87722f0e7314f3d0febb970aa7769eada6d33
Signed-off-by: Stefan Beller
---
refs.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/refs.c b/refs.c
index f0f0d23..58de60c 10064
Hi,
so I have installed git version 2.2.0 currently, because I was trying to
reproduce "Bug in reflog of length 0x2BFF".
Now I was using git as a normal user, rebasing some stuff
(incidentally the reflog improvements)
and an error occurred:
$ git rebase --continue
error: Ref refs/heads/todo_sb13_
Junio C Hamano writes:
> Johannes Schindelin writes:
>
>> +static const char *update_worktree(unsigned char *sha1)
>> +{
>> +...
>> +const char *work_tree = git_work_tree_cfg ? git_work_tree_cfg : "..";
>
> I overlooked this one, but is there a reason why this has to look at
> an internal im
Johannes Schindelin writes:
> +static const char *update_worktree(unsigned char *sha1)
> +{
> +...
> + const char *work_tree = git_work_tree_cfg ? git_work_tree_cfg : "..";
I overlooked this one, but is there a reason why this has to look at
an internal implementatino detail which is git_wor
Hi Christoph,
Christoph Mallon wrote:
> % git rev-parse 'master@{52}'
> warning: Log for ref refs/heads/master has gap after Thu, 1 Jan 1970 00:00:01
> +.
> 0036
Can you say more? What output did you expect and how does this differ
from it?
I tried, wit
Am 01.12.14 19:53, schrieb Stefan Beller:
> So I am running a 3.13.0-40-generic x86_64 linux (so its's amd64) and
> git version 2.1.2
> and I cannot reproduce the bug you are describing. :(
):
I can reproduce it with
* OS X, i386 binary, git 2.2.0
* FreeBSD, amd64, git 2.1.0 and up (bisected it t
Junio C Hamano writes:
> Stefan Beller writes:
>
>> +fetch.depth::
>> +If set, fetch will automatically behave as if the `--depth`
>> +option was given on the command line. This allows users to keep
>> +the git directory at low space requirements, and thus comes in handy
>> +for
On Fri, 2014-11-28 at 18:13 +0700, Duy Nguyen wrote:
> On Wed, Nov 19, 2014 at 1:12 AM, David Turner
> wrote:
> >> Or will you go
> >> with cityhash now.. I ask because you have another sse optimization
> >> for hashmap on your watchman branch and that could reduce init time
> >> for name-hash. N
Stefan Beller writes:
> When having a repository, which deals with large amounts of data, i.e.
> graphics, music, films, you may want to keep the git directory at
> the smallest size possible.
>
> The depth option helped us in achieving this goal by removing the sizable
> history and just keep re
David Michael writes:
>> Huh? I am confused. Since when is it legal to give NULL as statbuf
>> to (l)stat(2)?
>>
>> Wouldn't something like this be sufficient and necessary?
>>
>> int rc = stat(path, buf);
>> if (rc)
>> return rc;
>>
>> That is, let the underlyin
Does this contain a lot of borrowed code or something? The style
violation in the patches are unusually high, even compared with your
other series.
I've tried to fix it up and will push out the result on 'pu' if
things work OK, but this does not even have tests, so it is unlikely
that it would br
Nguyễn Thái Ngọc Duy writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy
Hmph, that's sad. Should the below say "test_expect_failure"
without "test_must_fail", anticipating a fix later?
t/t3102-ls-tree-wildcards.sh | 4
1 file changed, 4 insertions(+)
diff --git a/t/t3102-ls-tree-wildcards.
Nguyễn Thái Ngọc Duy writes:
> This allows the callback to use 'base' as a temporary buffer to
> quickly assemble full path "without" extra allocation. The callback
> has to restore it afterwards of course.
Hmph, what's the quote around 'without' doing there?
--
To unsubscribe from this list:
On Mon, Dec 1, 2014 at 12:57 PM, Junio C Hamano wrote:
> David Michael writes:
>
>> On Mon, Dec 1, 2014 at 9:44 AM, Duy Nguyen wrote:
>>> On Sun, Nov 30, 2014 at 9:41 AM, David Michael wrote:
+int git_stat(const char *path, struct stat *buf)
+{
+ int rc;
+ rc = s
When having a repository, which deals with large amounts of data, i.e.
graphics, music, films, you may want to keep the git directory at
the smallest size possible.
The depth option helped us in achieving this goal by removing the sizable
history and just keep recent history around. In the case of
So I am running a 3.13.0-40-generic x86_64 linux (so its's amd64) and
git version 2.1.2
and I cannot reproduce the bug you are describing. :(
$ git rev-parse 'master@{52}'
0035
What I noticed though is there are 2 linefeeds at the end of each
line, is that inte
Junio C Hamano writes:
> David Kastrup writes:
>
>> I disagree that --exit-code does nothing: it indicates whether the
>> listed log is empty. So for example
>>
>> git log -1 --exit-code a..b > /dev/null
>>
>> can be used to figure out whether "a" is a proper ancestor of "b" or
>> not.
>
> Hmph
Torsten Bögershausen writes:
> On 12/01/2014 04:02 AM, Michael Blume wrote:
>> I have no idea whether this should concern anyone, but my mac build of git
>> shows
>>
>> CC imap-send.o
>> imap-send.c:183:36: warning: 'ERR_error_string' is deprecated: first
>> deprecated in OS X 10.7 [-Wdepre
David Michael writes:
> On Mon, Dec 1, 2014 at 9:44 AM, Duy Nguyen wrote:
>> On Sun, Nov 30, 2014 at 9:41 AM, David Michael wrote:
>>> +int git_stat(const char *path, struct stat *buf)
>>> +{
>>> + int rc;
>>> + rc = stat(path, buf);
>>> + if (buf != NULL)
>>
>> It's a minor t
On Nov 30, 2014, at 21:31, Torsten Bögershausen wrote:
On 12/01/2014 04:02 AM, Michael Blume wrote:
I have no idea whether this should concern anyone, but my mac build
of git shows
CC imap-send.o
imap-send.c:183:36: warning: 'ERR_error_string' is deprecated: first
deprecated in OS X 10.7
David Kastrup writes:
> I disagree that --exit-code does nothing: it indicates whether the
> listed log is empty. So for example
>
> git log -1 --exit-code a..b > /dev/null
>
> can be used to figure out whether "a" is a proper ancestor of "b" or
> not.
Hmph.
$ git log --exit-code master..m
On Mon, Dec 1, 2014 at 9:44 AM, Duy Nguyen wrote:
> On Sun, Nov 30, 2014 at 9:41 AM, David Michael wrote:
>> +int git_stat(const char *path, struct stat *buf)
>> +{
>> + int rc;
>> + rc = stat(path, buf);
>> + if (buf != NULL)
>
> It's a minor thing, but maybe test "!rc" instead
On Mon, Dec 1, 2014 at 7:48 AM, David Michael wrote:
> On Mon, Dec 1, 2014 at 12:55 AM, Torsten Bögershausen wrote:
>> On 12/01/2014 04:40 AM, David Michael wrote:
>>>
>>> On Sun, Nov 30, 2014 at 3:16 PM, Torsten Bögershausen
>>> wrote:
>>> [snip]
Could the code be more human-readable
Duy Nguyen writes:
> On Sun, Nov 30, 2014 at 12:18:40PM -0500, Mark Levedahl wrote:
>> On 11/30/2014 03:24 AM, Nguyễn Thái Ngọc Duy wrote:
>> > One branch obviously can't be checked out at two places (but detached
>> > heads are ok). Give the user a choice in this case: --detach, -b
>> > new-bran
Junio C Hamano writes:
> Sergey Organov writes:
>
>> Hello,
>>
>> $ git help log | grep exit-code
>>problems are found. Not compatible with --exit-code.
>> $
>>
>> What --exit-code does in "git log"?
>
> It doesn't. That is why it is not listed.
I disagree that --exit-code does not
This was originally meant to be used to rewrite run_commit_hook()
that only special cases the GIT_INDEX_FILE environment, but the
run_hook_ve() refactoring done earlier made the implementation of
run_commit_hook() thin and clean enough.
Nobody uses this, so retire it as an unfinished clean-up made
Junio C Hamano writes:
> Sergey Organov writes:
>
>> Junio C Hamano writes:
>>
>>> Sergey Organov writes:
>>>
Hello,
$ git help log | grep exit-code
problems are found. Not compatible with --exit-code.
$
What --exit-code does in "git log"?
>>>
>>>
Sergey Organov writes:
> Junio C Hamano writes:
>
>> Sergey Organov writes:
>>
>>> Hello,
>>>
>>> $ git help log | grep exit-code
>>>problems are found. Not compatible with --exit-code.
>>> $
>>>
>>> What --exit-code does in "git log"?
>>
>> It doesn't. That is why it is not listed
Junio C Hamano writes:
> Sergey Organov writes:
>
>> Hello,
>>
>> $ git help log | grep exit-code
>>problems are found. Not compatible with --exit-code.
>> $
>>
>> What --exit-code does in "git log"?
>
> It doesn't. That is why it is not listed.
Then, how can --check possibly inter
Sergey Organov writes:
> Hello,
>
> $ git help log | grep exit-code
>problems are found. Not compatible with --exit-code.
> $
>
> What --exit-code does in "git log"?
It doesn't. That is why it is not listed.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the bo
Aarni Koskela writes:
> Hello!
>
> This patch makes it possible to select or unselect files in `git add -i`
> by regular expression instead of unique prefix only.
>
> The command syntax is `/foo` for selection and `-/foo` for unselection.
> I don't think the syntax will conflict with any existing
This commit seems to introduce the bug:
4207ed285f31ad3e04f08254237c0c1a1609642b
--
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
Lars Wendler writes:
> Subject: Re: [PATCH] Fix build with LDFLAGS="-Wl,--as-needed"
Please identify what area you are touching, e.g.
Subject: contrib/svn-fe: avoid early $(EXTLIBS) on linker invocation
or whatever.
"Fix build" does not tell us why this change is needed; it does not
s
Hi,
I encountered a strange bug concerning the reflog.
I suspect some kind of out-of-bounds access.
The symptom is:
%git rev-parse 'master@{52}'
warning: Log for ref refs/heads/master has gap after Thu, 1 Jan 1970
00:00:01 +.
0036
Try the following:
git i
On Mon, Dec 01, 2014 at 05:43:16PM +0700, Duy Nguyen wrote:
> On Mon, Dec 1, 2014 at 6:27 AM, Max Kirillov wrote:
>> But, while hacking the submodule init I became more
>> convinced that the modules directory should be common and
>> submodules in checkout should be a checkouts of the
>> submodule.
On Sun, Nov 30, 2014 at 9:41 AM, David Michael wrote:
> +int git_stat(const char *path, struct stat *buf)
> +{
> + int rc;
> + rc = stat(path, buf);
> + if (buf != NULL)
It's a minor thing, but maybe test "!rc" instead of "buf != NULL"?
> + buf->st_mode = mode_nat
Hello,
I'm trying to get gitk to draw the relationship between a bunch of integration
branches.
What I'm looking for is a graph that would show which of those branches is
included by
others. --simplify-by-decoration nearly does the job, but does not omit those
heads
merged into the requested b
Hi,
I discovered this while rebasing a branch after having converted files
to use LF line endings. I got around the problem by using
--ignore-whitespace but the error still seems strange to me so I'm
reporting it.
The following script is equivalent: it creates a repo with a CRLF file,
creates a "
On Mon, Dec 1, 2014 at 12:55 AM, Torsten Bögershausen wrote:
> On 12/01/2014 04:40 AM, David Michael wrote:
>>
>> On Sun, Nov 30, 2014 at 3:16 PM, Torsten Bögershausen
>> wrote:
>> [snip]
>>>
>>> Could the code be more human-readable ?
>>> static inline mode_t mode_native_to_git(mode_t native_mod
Hello,
$ git help log | grep exit-code
problems are found. Not compatible with --exit-code.
$
What --exit-code does in "git log"?
--
Sergey.
--
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
On Mon, Dec 1, 2014 at 6:27 AM, Max Kirillov wrote:
> But, while hacking the submodule init I became more convinced that the
> modules directory should be common and submodules in checkout should be
> a checkouts of the submodule. Because this is looks like concept of
> submodules, that they are u
On Sun, Nov 30, 2014 at 12:18:40PM -0500, Mark Levedahl wrote:
> On 11/30/2014 03:24 AM, Nguyễn Thái Ngọc Duy wrote:
> > One branch obviously can't be checked out at two places (but detached
> > heads are ok). Give the user a choice in this case: --detach, -b
> > new-branch, switch branch in the ot
Alfred Perlstein wrote:
> This change allows git-svn to support setting subversion properties.
>
> Very useful for manually setting properties when committing to a
> subversion repo that *requires* properties to be set without requiring
> moving your changeset to separate subversion checkout in o
Hello!
This patch makes it possible to select or unselect files in `git add -i`
by regular expression instead of unique prefix only.
The command syntax is `/foo` for selection and `-/foo` for unselection.
I don't think the syntax will conflict with any existing use cases, but feel
free to prove m
Signed-off-by: Lars Wendler
---
contrib/svn-fe/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/svn-fe/Makefile b/contrib/svn-fe/Makefile
index e8651aa..b90cf87 100644
--- a/contrib/svn-fe/Makefile
+++ b/contrib/svn-fe/Makefile
@@ -74,7 +74,7 @@ endif
endif
74 matches
Mail list logo
