David Davis wrote:
> I'm seeing 6 individual emails, how do I just see one email followed by 5
> email replies to the one? I don't want six individual emails.
The five email replies you want are still individual emails.
Emails are ALWAYS "individual", and reply emails simply have a
References: an
Andreas Heiduk wrote:
> Signed-off-by: Andreas Heiduk
Thanks.
Signed-off-by: Eric Wong
And pushed for Junio:
The following changes since commit fe0a9eaf31dd0c349ae4308498c33a5c3794b293:
Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn (2018-04-12
08:05:2
Jonathan Nieder wrote:
> Yeah, people really do use Git.pm as an external API.
Yikes :<
> If we want to prevent this, then we should not be installing it in the
> public perl module path. Or we should at least add a note to the
> manpages we ship :) to recommend not using it.
I think a note in
Todd Zullinger wrote:
> These tests are not run by default nor are they enabled in travis-ci. I
> don't know how much testing they get in user or other packager builds.
>
> I've been slowly increasing the test suite usage in fedora builds. I
> ran into this while testing locally with parallel m
you to fetch changes up to 95450bbbaaacaf2d603a4fbded25d55243dfb291:
git-svn: convert CRLF to LF in commit message to SVN (2017-12-14 00:09:38
+)
Eric Wong (1):
git-svn: convert CRLF to LF in commit message to SVN
git-svn.perl| 1 +
Ævar Arnfjörð Bjarmason wrote:
> On Sun, Dec 24 2017, Jeff King jotted:
> > As far as this actual perl change goes, I don't have a strong opinion. I
> > agree it would be nice to eventually move forward, and your reasoning
> > about what constitutes "old" seems sane. But we also don't write much
>
tree-wide.
> On Sun, Dec 24 2017, Eric Wong jotted:
> > Maybe we change our docs to say we welcome 5.10 features for new
> > code, but I'm against changing things for the sake of change.
>
> I should have mentioned this in the commit message, but for me it's
> mai
Jason Greenbaum wrote:
> --trunk=trunk/project_of_interest \
> --branches=branches/FF-1.0/project_of_interest \
> --branches=branches/FF-1.1/project_of_interest \
> The trunk seems to become the 'master' branch just fine, but my svn
> branches are not pulled down. I'm not sure I have the syntax
Gargi Sharma wrote:
> --- a/list.h
> +++ b/list.h
> @@ -93,6 +93,13 @@ static inline void list_move(struct list_head *elem,
> struct list_head *head)
> list_add(elem, head);
> }
>
> +/* Move to the front of the list. */
> +static inline void list_move_to_front(struct list_head *elem, str
While fsck_walk/fsck_walk_tree/parse_tree populates "struct tree"
idempotently, it is still up to the fsck_walk caller to call
free_tree_buffer.
Fixes: ad2db4030e42890e ("fsck: remove redundant parse_tree() invocation")
Signed-off-by: Eric Wong
---
These APIs could probabl
Brandon Williams wrote:
> On 04/11, Eric Wong wrote:
> > Hi Brandon, this series tickles an old itch of mine, so I
> > started working off of it. I'm only somewhat concerned
> > with the path resolution in execvp(e) pontentially calling
> > malloc on some libcs;
Brandon Williams wrote:
> On 04/11, Eric Wong wrote:
> > On the other hand, I believe we should make run-command
> > vfork-compatible (and Brandon's series is a big (but incomplete)
> > step in the (IMHO) right direction); as anything which is
> > vfork-safe would
Brandon Williams wrote:
> @@ -487,7 +483,7 @@ int start_command(struct child_process *cmd)
> atexit(notify_parent);
>
> if (cmd->no_stdin)
> - dup_devnull(0);
> + dup2(null_fd, 0);
I prefer we keep error checking for dup2 failu
Jonathan Nieder wrote:
> Brandon Williams wrote:
> > The post-update hooks created in t5550-http-fetch-dumb.sh is missing the
> > "!#/bin/sh" line which can cause issues with portability. Instead
> > create the hook using the 'write_script' function which includes the
> > proper "#!" line.
> Thi
fire in the child. Continue ignoring
ignored signals, but reset the rest to defaults.
Similarly, disable pthread cancellation to future-proof our code
in case we start using cancellation; as cancellation is
implemented with signals in glibc.
Signed-off-by: Eric Wong
---
Changes from my ori
Brandon Williams wrote:
> On 04/13, Eric Wong wrote:
> > Jonathan Nieder wrote:
> > > Brandon Williams wrote:
> > > > The post-update hooks created in t5550-http-fetch-dumb.sh is missing the
> > > > "!#/bin/sh" line which can cause issues with
Brandon Williams wrote:
> On 04/13, Eric Wong wrote:
> > @@ -277,6 +278,8 @@ static void child_err_spew(struct child_process *cmd,
> > struct child_err *cerr)
> > error_errno("exec '%s': cd to '%s' failed",
> >
Eric Wong wrote:
> Brandon Williams wrote:
> > On 04/13, Eric Wong wrote:
> > > @@ -277,6 +278,8 @@ static void child_err_spew(struct child_process *cmd,
> > > struct child_err *cerr)
> > > error_errno("exec '%s': cd to '%s'
Brandon Williams wrote:
> +++ b/run-command.c
> @@ -211,14 +211,82 @@ static const char **prepare_shell_cmd(struct argv_array
> *out, const char **argv)
> #ifndef GIT_WINDOWS_NATIVE
> static int child_notifier = -1;
>
> -static void notify_parent(void)
> +enum child_errcode {
> + CHILD_ER
Brandon Williams wrote:
> + if (cmd->no_stdin || cmd->no_stdout || cmd->no_stderr) {
> + null_fd = open("/dev/null", O_RDWR | O_CLOEXEC | O_NONBLOCK);
O_NONBLOCK? This was in my original patch, too :x
Wow, I wonder what I was smoking that day...
Brandon Williams wrote:
> On 04/14, Brandon Williams wrote:
> > /*
> > +* restore default signal handlers here, in case
> > +* we catch a signal right before execve below
> > +*/
> > + for (sig = 1; sig < NSIG; sig++) {
> > +
+Cc Karsten for comments below...
Brandon Williams wrote:
> In order to avoid allocation between 'fork()' and 'exec()' prepare the
> environment to be used in the child process prior to forking.
>
> Switch to using 'execve()' so that the construct child environment can
> used in the exec'd proce
Johannes Sixt wrote:
> Am 19.04.2017 um 01:18 schrieb Brandon Williams:
> >@@ -400,6 +404,53 @@ static char **prep_childenv(const char *const *deltaenv)
> > }
> > #endif
> >
>
> Does this #endif in this hunk context belong to an #ifndef
> GIT_WINDOWS_NATIVE? If so, I wonder why these new function
Ethan Clevenger wrote:
> Git version: 2.12.2.windows.2
>
> `git svn tag 1.0` results in:
Note, "git svn tag" uses the same backend code as "git svn branch",
and there was a recent fix for that in
commit e0688e9b28f2c5ff711460ee8b62077be5df2360
("git svn: fix authentication with 'branch'")
Loo
(I have no idea what Jonathan Tirado wrote; it was encrypted (but
sent to a public list).
Samuel Lijin wrote:
> Yep, I see these on public-inbox.org/git/ but not in my gmail inbox:
Hi Samuel, check your Spam box (and move it to a normal inbox so
they can train it). Gmail filters are known to t
Ævar Arnfjörð Bjarmason wrote:
> Thanks a lot for public-inbox, my only problem with it is that it
> doesn't cover every single mailing list I'm on, just git :)
Yes, I'm hoping more folks can start running their own
instances. I notice you're on p5p where I started to
occasionally lurk a few yea
Eric Wong wrote:
> (OTOH, I noticed a thread/mbox download bug in public-inbox,
> https://public-inbox.org/git/xmqqmvaq702u@gitster.mtv.corp.google.com/t.mbox.gz
> only shows two messages out of many. Will need to fix that...)
I think I fixed that bug, at least:
https://public-
Junio C Hamano wrote:
> As it is a pain to access gmail inbox via imap (I was told that
> something called "offline imap" may alleviate the pain, but I
> haven't tried it yet),
offlineimap isn't bad; I've been using it since 2003-2004
and can say it's easier-to-setup and more reliable than
isync/
Samuel Lijin wrote:
> Sorry, should've been clearer - I did check my spambox in my original
> message. Some old patches from Brandon were in there, but the ones I
> mentioned in my original message just seem to have been dropped.
Apparently, vger also throttles mail to gmail aggressively, so
mayb
Samuel Lijin wrote:
> > Samuel Lijin wrote:
> >> Yep, I see these on public-inbox.org/git/ but not in my gmail inbox:
> >
> > Hi Samuel, check your Spam box (and move it to a normal inbox so
> > they can train it). Gmail filters are known to trigger happy
> > and incorrectly flag messages. It's
perl5.
8<
Subject: [PATCH] run-command: use vfork instead of fork
To enable vfork, we merely have to avoid modifying memory we
share with the parent, so the guard functions
`child_(error|warn|die)_fn` can now be disabled.
FIXME: still missing autoconf + Makefile portabili
This fixes t4202 for me at "44 - log --graph with full output"
on 32-bit x86.
Signed-off-by: Eric Wong
---
This is for pu, I'm still using the machine I used git with in 2005 :)
builtin/name-rev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/name-
Stefan Agner wrote:
> This addresses the issue reported here:
> https://public-inbox.org/git/997160314bbafb3088a401f1c09cc...@agner.ch/
Thanks for bringing this up.
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -1642,10 +1642,15 @@ foreach my $t (@files) {
>
Johannes Schindelin wrote:
> Hi team,
>
> I found myself in dear need to quickly look up mails in the public-inbox
> mail archive corresponding to any given commit in git.git. Some time ago,
> I wrote a shell script to help me with that, and I found myself using it a
> couple of times, so I think
Oops, some upgrades went awry for the non-Tor HTTPS endpoint termination.
The Tor .onions should remain available if that happens
http://ou63pmih66umazou.onion/git
http://czquwvybam4bgbro.onion/git
http://hjrcffqmbrq6wope.onion/git
nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
nntp
Daniel Villeneuve wrote:
> subscribe
That line should be "subscribe git" and it needs to be
sent to majord...@vger.kernel.org , not this list.
Drew DeVault wrote:
> When shown the email summary, an opportunity is presented for the user
> to edit the email as if they had specified --annotate. This also permits
> them to edit it multiple times.
Thanks, this seems like a good idea for the cover letter, especially.
I prefer to get the commi
Stefan Beller wrote:
> Today I learned again how public-inbox is awesome! Thanks Eric!
You're welcome :)
> * You can just copy the message ID INCLUDING the surrounding < >
> and public inbox still just shows you the correct message. I had assumed
> you would need to strip off the < > and I d
Andreas Heiduk wrote:
> Add the missing documentation for `git svn init --ignore-refs`.
>
> Signed-off-by: Andreas Heiduk
Thanks, signed-off and pushed for Junio:
The following changes since commit 8d1b10321b20bd2a73a5b561cfc3cf2e8051b70b:
Sync with maint (2017-06-07 09:32:04 +0900)
Jonathan Nieder wrote:
> Hi,
>
> Ævar Arnfjörð Bjarmason wrote:
>
> > Add a FREEZ() wrapper marco for the common pattern of freeing a
> > pointer and assigning NULL to it right afterwards.
>
> I'm conflicted. On one hand it makes code more concise and makes it
> easier for people to remember t
Junio C Hamano wrote:
> Eric Wong writes:
> > I don't see the point of a macro wrapper, forcing the user to
> > type out the '&' should drive home the point that the pointer
> > gets set to NULL. I also find capitalization tiring-to-read
> &
Hey all,
https://public-inbox.org/git/_/text/help has a few new prefixes
which might help improve searching:
dfn: match filename from diff
dfa: match diff removed (-) lines
dfb: match diff added (+) lines
dfhh:match diff hunk header context (usually
Andreas Heiduk wrote:
> Some options specific for `git svn commit-diff` where not documented
> so far.
>
> Signed-off-by: Andreas Heiduk
Thanks again. It's been a while since "commit-diff" :)
Signed-off and pushed for Junio:
The following changes since commit 02a2850ad58eff6de70eb2dc5f9634
Ævar Arnfjörð Bjarmason wrote:
> On Wed, Jun 21 2017, Tim Hutt jotted:
>
> > Hi,
> >
> > Currently if you want to monitor a repository for changes there are
> > three options:
> >
> > * Polling - run a script to check for updates every 60 seconds.
> > * Server side hooks
> > * Web hooks (on Githu
Ævar Arnfjörð Bjarmason wrote:
> On Wed, Jun 21 2017, Eric Wong jotted:
> > I've long wanted to do something better to allow others to keep
> > public-inbox mirrors up-to-date. Having only 64-128 bytes of
> > overhead per userspace per-connection should be tota
Eric Wong wrote:
> And, yes, email does seem redundant, and
> modern header sizes (with DKIM, etc) are gigantic; but
> connection lifetime and concurrency is manageable to the server
> even if not instantaneous.
I should add that any email notification message should be
significa
I'm not sure why, but this is causing t1414.8 failures on 32-bit
x86 with the latest pu with Debian jessie (oldstable).
Reverting this (beafb2c62947a6d4a97b9c3baf99fe62ec8e830f) in pu
seems to fix the test for me.
+Cc: Ramsay since he also had a 32-bit environment.
--8<--
ok 7 - --parents shows
Jeff King wrote:
> On Fri, Jul 07, 2017 at 12:32:39AM +, Eric Wong wrote:
>
> > I'm not sure why, but this is causing t1414.8 failures on 32-bit
> > x86 with the latest pu with Debian jessie (oldstable).
> >
> > Reverting this (beafb2c62947a6d4a97b9c3ba
Jeff King wrote:
> I agree that a full binary search of a reftable is harder because of the
> prefix compression (it may still be possible by scanning backwards, but
> I think there are ambiguities when you land in the middle of a record,
> since there's no unambiguous end-of-record character). Bu
FD_CLOEXEC only applies to the file descriptor, so it needs to be
manipuluated via F_GETFD/F_SETFD. F_GETFL/F_SETFL are for file
description flags.
Verified via strace with o_cloexec set to zero.
Signed-off-by: Eric Wong
---
sha1_file.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions
Jason Pyeron wrote:
>
> I am asuming that this is an issue caused by codeplex's svn
> from tfs implementation. Does anyone here have any insight?
Seems like it, even using svn(1) fails (see below)
> r27599 = 9e769d8327767a155d7b96b7cc28579cf0ed4c93 (refs/remotes/git-svn)
> Malformed network dat
Gargi Sharma wrote:
> 7 files changed, 15 insertions(+), 86 deletions(-)
Thanks! I like the code reduction and increased use of list.h
Were you able to finish running the test suite? I wasn't :<
> -void mru_clear(struct mru *head)
> -{
> - struct list_head *pos;
> - struct list_head *
Ævar Arnfjörð Bjarmason wrote:
> If you have a bunch of git repositories cloned of the same project on
> the same filesystem, it would be nice of the packs that are produced
> would be friendly to block-level deduplication.
Fwiw, I currently get around this when mirroring by having all
the remote
Todd Zullinger wrote:
> brian m. carlson wrote:
> > r7 = f8467f2cee3bcead03e84cb51cf44f467a87457d
> > (refs/remotes/origin/tags/tag3)
> > error: git-svn died of signal 11
> >
> > Doing the following three times, I had two crashes.
> >
> > (set -e; for i in $(seq 1 20); do (cd t && ./t9128-git-s
Johannes Schindelin wrote:
> Hey fellow gitters,
>
> I found these sad news in my timeline today:
>
> https://twitter.com/cdibona/status/957822400518696960
I'm shocked and in denial over this. Thank you, Shawn!
And thank you Johannes for passing this along.
Ævar Arnfjörð Bjarmason wrote:
> On Fri, Jan 26, 2018 at 6:32 PM, Michal Suchánek wrote:
> > This is wrong because the message will most likely not get delivered
> > when the author date differs from current time.
Even by a few seconds? I guess it depends on how many patches
you're sending at o
for you to fetch changes up to 2784b8d68faca823489949cbc69ead2f296cfc07:
git-svn: control destruction order to avoid segfault (2018-01-29 23:12:00
+)
----
Eric Wong (1):
git-svn: control destruction order to avoid segfault
git-svn.perl | 5 +++
Jonathan Nieder wrote:
> The fundamental thing is the actual Git commands, not the tests in the
> testsuite, no?
Right. I've never been picky about exit codes; only that a
non-zero happens on errors.
> In the rest of git, die() makes a command exit with status 128. The
> trouble here is that o
Jeff King wrote:
> On Wed, Feb 28, 2018 at 04:07:18AM +, Eric Wong wrote:
>
> > > In the rest of git, die() makes a command exit with status 128. The
> > > trouble here is that our code in Perl is assuming the same meaning for
> > > die() but using perl'
Duy Nguyen wrote:
> which saves 12 bytes (or another 74 MB). 222 MB total is plenty of
> space to keep some file cache from being evicted.
Nice! I can definitely benefit from lower memory usage when
packing. Fwiw, I use pahole with other projects to help find
packing opportunities:
git
Duy Nguyen wrote:
> struct revindex_entry {
> off_t offset;
> unsigned int nr;
> };
>
> We need on entry per object, so 6.5M objects * 16 bytes = 104 MB. If
> we break this struct apart and store two arrays of offset and nr in
> struct packed_git, we save 4 bytes per struct, 26 MB
Eric Sunshine wrote:
> On Sun, Mar 4, 2018 at 6:22 AM, Andreas Heiduk wrote:
> > In 36db1eddf9 ("git-svn: add --authors-prog option", 2009-05-14) the path
> > to authors-prog was made absolute because git-svn changes the current
> > directoy in some situations. This makes sense if the program is
Andreas Heiduk wrote:
> 2018-03-05 2:42 GMT+01:00 Eric Sunshine :
> > Doesn't such a behavior change deserve being documented (and possibly
> > tests)?
>
> The old behaviour was neither documented nor tested - the
> change did not break any test after all.
I consider that too low of a bar to ju
Hiroshi Shirosaki wrote:
> I have the following authentication failure while svn rebase and
> svn dcommit works fine without authentication failures.
>
> $ git svn branch v7_3
> Copying https://xxx at r27519
> to https:///v7_
iling slash).
Signed-off-by: Eric Wong
---
I was going to cite some style manuals (MLA, APA, etc),
but it seems current versions do not favor angle brackets.
However, this remains consistent with the recommendations in
RFC 2369 <https://ietf.org/rfc/rfc2369.txt> for mail headers.
README
Stefan Beller wrote:
> test_submodule_content () {
> + if test "$1" == "-C"
Use a single '=' for portability in sh. It's also a good idea
to prefix variables with 'x' or some such, since "$1" could be
"-n" or some other supported switch for test(1).
So, something like:
if test x"$1
Jeff King wrote:
> On Wed, Mar 01, 2017 at 10:22:04PM +, Eric Wong wrote:
>
> > Markdown supports automatic links by surrounding URLs with
> > angle brackets, as documented in
> > <https://daringfireball.net/projects/markdown/syntax#autolink>
>
> One o
Jeff King wrote:
> On Thu, Mar 02, 2017 at 07:34:21AM +, Eric Wong wrote:
> > Jeff King wrote:
> > > On Wed, Mar 01, 2017 at 10:22:04PM +, Eric Wong wrote:
> > >
> > > > Markdown supports automatic links by surrounding URLs with
> > > &
to enable
http.followRedirects in their config.
Signed-off-by: Eric Wong
---
http-walker.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/http-walker.c b/http-walker.c
index b34b6ace7..626badfe6 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -168,6 +168,12 @@ static int is_alterna
This likely has no real-world impact on memory usage,
but it is cleaner for future readers.
Fixes: abcbdc03895f ("http: respect protocol.*.allow=user for http-alternates")
Signed-off-by: Eric Wong
---
http-walker.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/http-walke
Jeff King wrote:
> The warning itself:
>
> > + warning("alternate disabled by http.followRedirects!=true: %s",
>
> feels like it could use some whitespace around the "!=", but maybe
> that's just me.
Yeah, I kinda wanted to emulate the command-line syntax.
Maybe rewording it a bit an
Jeff King wrote:
> On Sat, Mar 04, 2017 at 06:55:48AM +, Eric Wong wrote:
> > Jeff King wrote:
> > > The warning itself:
> > >
> > > > + warning("alternate disabled by
> > > > http.followRedirects!=true: %s",
&g
Thank you. I fixed spelling in the title (s/authenticaton/authentication/),
added my S-o-b, and pushed for Junio to pick up
The following changes since commit 3bc53220cb2dcf709f7a027a3f526befd021d858:
First batch after 2.12 (2017-02-27 14:04:24 -0800)
are available in the git repository at:
"brian m. carlson" wrote:
> I could support the argument for ditching RHEL/CentOS 5 support, but I
> expect other people might disagree. After all, we're still targeting
> C89.
Yeah, I still use and support CentOS 5 in some places (but maybe
not git, still using ancient versions there, too).
An
Jeff King wrote:
> On Tue, Mar 21, 2017 at 03:49:21PM +, Roger Pau Monné wrote:
>
> > I'm trying to use git send-email with msmtp, and I have added the following
> > to
> > my .gitconfig:
> >
> > [sendemail]
> > smtpserver = "/usr/local/bin/msmtp"
> >
> > This seems to work fine, excep
Craig McQueen wrote:
> When doing "git svn dcommit", the SVN revision just has the date/time stamp
> of the time of the dcommit.
Yeah, that's sometimes annoying to me, too.
> Apparently SVN revisions can have an "svn:original-date" property, which
> would be good to set on dcommit, to preserve
Craig McQueen wrote:
> Is it possible to set multi-line SVN properties somehow? Or
> could this be a future enhancement?
I'm not sure. I don't use this feature, but it seems tied
to gitattributes(5), and I'm not sure if gitattributes supports
multi-line values, either...
Craig McQueen wrote:
> Eric Wong wrote:
> > Craig McQueen wrote:
> > > Apparently SVN revisions can have an "svn:original-date" property, which
> > would be good to set on dcommit, to preserve the timestamp from the git
> > repository.
> > >
>
Ævar Arnfjörð Bjarmason wrote:
> Add a new manpage that gives an overview of how to tweak git's
> performance.
>
> There's currently no good single resource for things a git site
> administrator might want to look into to improve performance for his
> site & his users. This unfinished documentati
Ævar Arnfjörð Bjarmason wrote:
> On Mon, Apr 3, 2017 at 11:34 PM, Eric Wong wrote:
> > Ævar Arnfjörð Bjarmason wrote:
> >> - Should we be covering good practices for your repo going forward to
> >>maintain good performance? E.g. don't have some huge tree a
Lars Schneider wrote:
> > diff --git a/convert.h b/convert.h
> > index 82871a11d5..da6c702090 100644
> > --- a/convert.h
> > +++ b/convert.h
> > @@ -42,6 +42,11 @@ extern int convert_to_git(const char *path, const char
> > *src, size_t len,
> > struct strbuf *dst, enum safe_
Julian Goacher wrote:
> Is it possible to modify a bare repo directly? e.g. is it possible to
> insert a file into a bare repo without first cloning a non-bare copy?
> I'm thinking along the lines of a command or sequence of commands that
> modifies the file index and then copies the file blob int
Jonathan Nieder wrote:
> Hi,
>
> Brandon Williams wrote:
>
> > --- a/run-command.c
> > +++ b/run-command.c
> > @@ -458,6 +458,14 @@ int start_command(struct child_process *cmd)
> > argv_array_pushv(&argv, cmd->argv);
> > }
> >
> > + /*
> > +* NOTE: In order to prevent dea
into account chdir usage).
Signed-off-by: Eric Wong
---
run-command.c | 273 +-
1 file changed, 196 insertions(+), 77 deletions(-)
diff --git a/run-command.c b/run-command.c
index 2b3249de4..3d7a57385 100644
--- a/run-command.c
+++ b/
Junio C Hamano wrote:
> Urs Thuermann writes:
>
> > In parse_svn_date() prepend the correct UTC offset to the timestamp
> > returned. This is the offset in effect at the commit time instead of
> > the offset in effect at calling time.
> >
> > Signed-off-by: Urs Thuermann
> > ---
> > perl/Git/
Marc Herbert wrote:
> PS: I used NNTP and http://dir.gmane.org/gmane.comp.version-control.git
> to quickly find this old thread (what could we do without NNTP?). Then
> I googled for a web archive of this thread and Google could only find
> this one:
> http://git.661346.n2.nabble.com/BUG-in-git-d
rd internally when
there's little danger of mixing different git versions.
Totally untested (but passes "make test"), can you try this?
-8<--
Subject: [PATCH] rebase: use mboxrd format to avoid split errors
The mboxrd format allows the use of embedded "From &qu
ome do not. Use with -x.
Signed-off-by: Anthony Wong
---
Documentation/git-cherry-pick.txt | 8
builtin/revert.c | 2 ++
sequencer.c | 14 --
sequencer.h | 1 +
4 files changed, 19 insertions(+), 6 deletions(-)
On 28 October 2017 at 22:21, Kevin Daudt wrote:
>
> On Sat, Oct 28, 2017 at 08:04:40PM +0800, Anthony Wong wrote:
> > When cherry-picking from a commit whose commit message already
> > contains the "(cherry picked from commit ...)" line, this option will
> > n
Sorry, I forgot about this for a while :x
Florian Weimer wrote:
> On 10/08/2017 11:30 PM, Eric Wong wrote:
> >diff --git a/git-rebase--am.sh b/git-rebase--am.sh
> My context is slightly different, but I added the mboxrd options manually to
> both commands, and it fix
nges. This makes
"git reset" a little more user-friendly during a merge.
Signed-off-by: Andrew Wong
---
builtin/reset.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index 6004803..740263d 100644
--- a/builtin/reset.c
+++ b/
Signed-off-by: Andrew Wong
---
builtin/merge.c | 3 ++-
wt-status.c | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index e576a7f..07af427 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@ static int
Signed-off-by: Andrew Wong
---
wt-status.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wt-status.c b/wt-status.c
index 4e55810..6e1ad7d 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -899,7 +899,7 @@ static void show_merge_in_progress(struct wt_status *s
would want most of the time, and not "git reset --mixed". I haven't updated the
"git reset" docs yet, I'll update it if we decide to use this new behavior.
Comments?
Andrew Wong (3):
wt-status: Make conflict hint message more consistent with other hints
merge: Add
On Wed, Feb 26, 2014 at 1:21 PM, Matthieu Moy
wrote:
> But this breaks backward compatibility.
>
> I sometimes run "git reset" during a merge to only reset the index and
> then examine the changes introduced by the merge. With your changes,
> someone doing so would abort the merge and discard the
On Wed, Feb 26, 2014 at 3:37 PM, Junio C Hamano wrote:
> I see that you are trying to match the phrasing used in the other
> side of this if/else (which is outside the context of the posted
> patch). Over there we say "... to conclude merge" while the new
> text says "... to conclude THE merge".
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder wrote:
> Seems reasonable, but I worry about the command growing too noisy.
>
> Could this be guarded by an advice. setting? (See advice.*
> in git-config(1) for what I mean.)
Ah, good idea. This seems to belong to advice.resolveConflict. I'll
add
On Wed, Feb 26, 2014 at 3:48 PM, Jonathan Nieder wrote:
> I really don't like the idea of making "git reset" modal, though. I'd
> rather that reset --mixed print some advice about how to recover from
> the mistake, which would also have the advantage of allowing scripts
> that for whatever reason
On Wed, Feb 26, 2014 at 3:57 PM, Matthieu Moy
wrote:
> If you were to design "git reset"'s interface from scratch, your
> proposal would make sense. But we're talking about a change, and you
> can't expect that users never use the current behavior. At the very
> least, there should be a warning te
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder wrote:
> Andrew Wong wrote:
>
>> --- a/builtin/merge.c
>> +++ b/builtin/merge.c
>> @@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
>> fclose(fp);
>> rerere(allow_rerere_auto)
501 - 600 of 955 matches
Mail list logo
