Re: git diff autocomplete

2019-08-26 Thread Andreas Schwab
Some sort of flag which says we are handling files or revisions. That already exists, it is spelt `--'. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."

Re: [PATCH] t5319: don't trip over a user name with whitespace

2019-07-01 Thread Andreas Schwab
- MINSIZE=$(ls -l .git/objects/pack/*pack | awk "{print \$5;}" | > sort -n | head -n 1) && > + MINSIZE=$(stat -c %s .git/objects/pack/*pack | sort -n | head > -n 1) && You could also use ls -n. Andreas. -- Andreas Schwab, sch...@linux-m68k.org

Re: Deadname rewriting

2019-06-15 Thread Andreas Schwab
On Jun 14 2019, Phil Hord wrote: > It feels like `.git/info/grafts` would work the best if it could be > distributed with the project, but I'm pretty sure that's a non-starter > for many reasons. The graft file is obsoleted by git replace. Andreas. -- Andreas Schwab, sc

Re: git archive generates tar with malformed pax extended attribute

2019-05-25 Thread Andreas Schwab
On Mai 25 2019, René Scharfe wrote: > Can Unicode symlink targets contain NULs? We wouldn't want to damage > them even if we decide to truncate. The POSIX interface doesn't allow creating such a symlink, since the argument to symlink is a C string. Andreas. -- Andreas Schw

Re: Need help merging unrelated histories

2019-05-24 Thread Andreas Schwab
then git filter-branch to make it permanent? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."

Re: Surprising semantics of "git add file"

2019-05-05 Thread Andreas Schwab
t;git add" here? It doesn't commit, it adds to the index. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."

Re: I messed up my own git tree and I don't know how to fix it.

2019-04-21 Thread Andreas Schwab
with modified content. If you want to keep them you need to create commits in each modified submodule, then add them to the superproject and commit there. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And no

Re: [BUG] GIT_SSH_COMMAND is not being decomposed

2019-04-15 Thread Andreas Schwab
s a shell or something else (still trying to find that). See run-command.c:prepare_shell_cmd, if the command contains shell meta characters it is passed to sh -c without further quoting. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780

Re: git glossary --help ?

2019-04-06 Thread Andreas Schwab
rcuit direct to help > item. However this did not happen. $ git help glossary Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."

Re: Unable to change remote url of origin

2019-03-27 Thread Andreas Schwab
rc/grumpy (push) > > > It's still SSH. What am I doing wrong? Do you have a URL rewrite rule (url.*.insteadof)? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."

git replace --graft does error checking too late

2019-03-27 Thread Andreas Schwab
When running `git replace --graft A B' where B is a non-commit (eg. a tag) it displays an error, but creates the replace ref anyway. I think it should verify that B names a commit object before creating the ref. Andreas. -- Andreas Schwab, SUSE Labs, sch...@suse.de GPG Key fingerprint =

Re: Deprecating git diff ..; dealing with other ranges

2019-03-13 Thread Andreas Schwab
cially if the completion is ambigous. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."

Re: Deprecating git diff ..; dealing with other ranges

2019-03-12 Thread Andreas Schwab
diff A..B" is that you can c&p the output from the fetch run without the need to edit it. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."

Re: git rebase: retain original head?

2019-01-08 Thread Andreas Schwab
On Jan 08 2019, Markus Wiederkehr wrote: > On Tue, Jan 8, 2019 at 6:43 PM Andreas Schwab wrote: >> >> On Jan 08 2019, Markus Wiederkehr wrote: >> >> > Would it be possible to retain this information? >> >> You could use the reflog of the current branc

Re: git rebase: retain original head?

2019-01-08 Thread Andreas Schwab
ation? You could use the reflog of the current branch, where it is the second entry. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."

Re: Any way to make git-log to enumerate commits?

2018-12-05 Thread Andreas Schwab
On Dez 05 2018, Elijah Newren wrote: > Or, just use name-rev so it works with non-linear histories too: > > git log | git name-rev --refs=$(git symbolic-ref HEAD) --stdin | less That wouldn't work for a detached HEAD, though, and you need to use --no-abbrev. Andreas. -- Andre

Re: git broken for AIX somewhere between 2.13.2 and 2.13.3

2018-07-29 Thread Andreas Schwab
ompile farm <http://gcc.gnu.org/wiki/CompileFarm> has a machine running AIX, and is free to use for anyone working on free software. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."

Re: Git Bash Completion Not Working In Emacs

2018-04-16 Thread Andreas Schwab
M-x shell then Emacs handles special keys like TAB itself (and the started shell usually disables its own command line editing). If you use M-x term then Emacs emulates a terminal and lets the running process handle all special keys. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fi

Re: man page for "git remote set-url" seems confusing/contradictory

2018-04-16 Thread Andreas Schwab
> place". how can they be set differently yet still must refer to the > same place? They could be using different transport methods. For example, for fetching the unauthenticated git: method could be used, but for pushing an authenticated method like ssh: is usually needed. Andreas. -- Andre

Re: .gitattributes lookup doesn't respect GIT_WORK_TREE

2018-04-15 Thread Andreas Schwab
g tree, git log/show don't appear to do that. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."

.gitattributes lookup doesn't respect GIT_WORK_TREE

2018-04-15 Thread Andreas Schwab
ore is a git repository. It sets up a diff attribute that decrypts the contents, but that works only if the command is issued while inside the repository. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now fo

Re: git: CVE-2018-1000021: client prints server sent ANSI escape codes to the terminal, allowing for unverified messages to potentially execute arbitrary commands

2018-02-07 Thread Andreas Schwab
output - really. I'm sure it seemed like a good idea at the time, > but I can see how it could have been used for evil. Do you also want to block "+++AT"? :-) Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: contrib/completion/git-completion.bash: declare -g is not portable

2018-02-03 Thread Andreas Schwab
mmand. The `-g' option suppresses this behavior. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: [PATCH 05/14] packed-graph: implement construct_graph()

2018-01-26 Thread Andreas Schwab
On Jan 26 2018, Junio C Hamano wrote: > Also, would >>32 be a problem if commit.date is an uint32 (and > shifting all its bits out to the right)? It would be undefined. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 21

Re: [PATCH] enable core.fsyncObjectFiles by default

2018-01-17 Thread Andreas Schwab
On Jan 17 2018, Christoph Hellwig wrote: > I've lost data on development machines with various times countless > times due to the lack of this option, and now lost trees on a Too many times. :-) Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D5

Re: [BUG] git remote prune removes local tags, depending on fetch config

2018-01-16 Thread Andreas Schwab
ng branches are put in a separate name space. If you fetch the remote tags into a separate name space (eg. refs/remote/tags/*:refs/tags/*) then there is no conflict. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file

2017-12-01 Thread Andreas Schwab
r as POSIX is concerned, semicolons are not special, but can be used to separate commands instead of newlines. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: [PATCH v4 0/2] launch_editor(): indicate that Git waits for user input

2017-11-30 Thread Andreas Schwab
something. >> >> I agree with the "unbuffered" statement. I am surprised that you expect >> fflush() >> to do nothing in that situation... but I am no expert in that area. Can you >> point me to some documentation? > > Because stderr is unbuffer

Re: [PATCHv2 6/7] builtin/describe.c: describe a blob

2017-11-02 Thread Andreas Schwab
t if B3 renames or copies the blob? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: Why does fetch-pack not works over http?

2017-10-27 Thread Andreas Schwab
pack" > using "https" procotol. Example of a trace below: > > 12:03:07.512558 git.c:344   trace: built-in: git 'fetch- > pack' '--stateless-rpc' '--stdin' '--lock-pack' '--thin' 'https://githu > b.

Re: Minor man page weirdness?

2017-10-17 Thread Andreas Schwab
combination with Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: Minor man page weirdness?

2017-10-17 Thread Andreas Schwab
spaces). An easy workaround would be to add a comma between `-f` and 'git branch'. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: Minor man page weirdness?

2017-10-17 Thread Andreas Schwab
On Okt 17 2017, Jeff King wrote: > On Tue, Oct 17, 2017 at 07:25:28PM +0200, Andreas Schwab wrote: > >> >> I see this in git-branch.1: >> >> >> >> Reset to if exists already\&. >> >> Without >> >> \fB\-f\fR\fIgit br

Re: Minor man page weirdness?

2017-10-17 Thread Andreas Schwab
On Okt 17 2017, Jeff King wrote: > On Tue, Oct 17, 2017 at 06:29:59PM +0200, Andreas Schwab wrote: > >> On Okt 16 2017, Jeff King wrote: >> >> > I get: >> > >> > Reset to if exists already\&. >> > Without >> > \fB

Re: Minor man page weirdness?

2017-10-17 Thread Andreas Schwab
ut \fB\-f\fR\fIgit branch\fR refuses to change an existing branch\&. In combination with This is with asciidoc 8.6.9. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: Consider escaping special characters like 'less' does

2017-10-16 Thread Andreas Schwab
ith embedded escape sequences? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: Consider escaping special characters like 'less' does

2017-10-15 Thread Andreas Schwab
a/some_file b/some_file >> new file mode 100644 >> index 000..357323f >> --- /dev/null >> +++ b/some_file >> @@ -0,0 +1 @@ >> +?Hello >> \ No newline at end of file > > It is your terminal, not git's fault that you get a ? rendered. It's your MUA's fault that you get a ?, the mail didn't contain any. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: [PATCH v2] for_each_string_list_item: avoid undefined behavior for empty list

2017-09-21 Thread Andreas Schwab
On Sep 21 2017, Junio C Hamano wrote: > Now you make me curious. How would that variant be different from > option C. in Jonathan's message? Only in the parity of the condition. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D

Re: [PATCH v2] for_each_string_list_item: avoid undefined behavior for empty list

2017-09-20 Thread Andreas Schwab
On Sep 20 2017, Jonathan Nieder wrote: > Andreas Schwab wrote: >> On Sep 19 2017, Jonathan Nieder wrote: > >>> B. #define for_each_string_list_item(item, list) \ >>> if (list->items) \ >>> for (item = ...; ...; ... ) >>&g

Re: [PATCH v2] for_each_string_list_item: avoid undefined behavior for empty list

2017-09-20 Thread Andreas Schwab
ing_list_item(item, list) > ... > else > ... > >making it a non-starter. That can be fixed with a dangling else. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: git-describe --contains

2017-08-11 Thread Andreas Schwab
ning the above commit was merged into a branch that follows v4.9-rc2, which eventually was merged into v4.10-rc1. > BTW, what are the numbers 154^2~44^2~178 that follow the tag name? See git-rev-parse(1). '~N' means to go back N parents, ^N means to pick parent N of a merge commit. Andre

Re: [PATCH] tests: don't give unportable ">" to "test" built-in, use -gt

2017-08-07 Thread Andreas Schwab
&& > test_cmp expect actual && > run_with_limited_stack git tag --no-contains HEAD >actual && > - test_line_count ">" 10 actual > + test_line_count "-gt" 10 actual Maybe also remove the quotes, they are no longer need

Re: [RFC] imap-send: escape backslash in password

2017-08-04 Thread Andreas Schwab
= DQUOTE *QUOTED-CHAR DQUOTE QUOTED-CHAR = / "\" quoted-specials quoted-specials = DQUOTE / "\" Thus the quoting applies to any element that is a string (and a double quote needs to be quoted as well). Andreas. -- Andreas Schwab, sch...@linux-m68k.or

Re: Git on macOS shows committed files as untracked

2017-07-14 Thread Andreas Schwab
gt; > Thanks for testing - > Normal and Normal ;-) > For me the 6th code point does look strange > The "box" with 04142F: This is actually 1244f (CUNEIFORM NUMERIC SIGN ONE BAN2). Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Andreas Schwab
guarantee (e.g., gcc had designated initializers before > C99 existed). Note that the GNU C designated initializers initially used a different syntax than the one C99 adopted. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276

Re: [PATCH] apply: use strcmp(3) for comparing strings in gitdiff_verify_name()

2017-07-09 Thread Andreas Schwab
On Jul 09 2017, René Scharfe wrote: > [2] http://pubs.opengroup.org/onlinepubs/009695399/functions/memchr.html You are using an old revision. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for s

Re: [PATCH] apply: use strcmp(3) for comparing strings in gitdiff_verify_name()

2017-07-08 Thread Andreas Schwab
On Jul 08 2017, René Scharfe wrote: > Am 08.07.2017 um 13:08 schrieb Andreas Schwab: >> On Jul 08 2017, René Scharfe wrote: >> >>> Avoid running over the end of another -- a C string whose length we >>> don't know -- by using strcmp(3) instead of memcmp(

Re: [PATCH] apply: use strcmp(3) for comparing strings in gitdiff_verify_name()

2017-07-08 Thread Andreas Schwab
past the differing characters. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: Migration from CVS to Git looses merges

2017-06-25 Thread Andreas Schwab
rge branch ([-\w]+)' to match it. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: [PATCH v2 1/2] git-compat-util: add a FREEZ() wrapper around free(ptr); ptr = NULL

2017-06-09 Thread Andreas Schwab
On Jun 09 2017, Jonathan Nieder wrote: > That way side-effectful callers like FREEZ(func() ? a : b) would > work. Except that you cannot take the address of a non-lvalue. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Andreas Schwab
-access > emulation" our userland may not see a SIGBUS. Even if the architecture implements unaligned accesses in hardware, it is still undefined behaviour, and the compiler will (eventually) take advantage of it. Andreas. -- Andreas Schwab, SUSE Labs, sch...@suse.de GPG Key fingerprint

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Andreas Schwab
On Jun 01 2017, "brian m. carlson" wrote: > On Thu, Jun 01, 2017 at 10:28:52AM +0200, Andreas Schwab wrote: >> The sh1dc implementation is making unaligned accesses, which will crash >> on some architectures, others have to emulate them in software. >> >>

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Andreas Schwab
This is git 2.13.0. Andreas. -- Andreas Schwab, SUSE Labs, sch...@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."

Re: Unaligned accesses in sha1dc

2017-06-01 Thread Andreas Schwab
SHA1DCUpdate calls sha1_process with buf being unaligned. Andreas. -- Andreas Schwab, SUSE Labs, sch...@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."

Unaligned accesses in sha1dc

2017-06-01 Thread Andreas Schwab
SHA1COMPRESS_FULL_ROUND2_STEP(e, a, b, c, d, W, 26, temp); Andreas. -- Andreas Schwab, SUSE Labs, sch...@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."

Re: Bug: wrong documentation for git-fast-import's option command

2017-04-30 Thread Andreas Schwab
SP ('=' > )? LF" (similarly to the docs for feature), and explain this > is meant to allow other consumers of the fast import format. > > Looks like this bug existed since the option command was added in > 9c8398f in 2009. Am I the first one who tried to use it? ;-

Re: [PATCH v2] rebase -i: add config to abbreviate command-names

2017-04-25 Thread Andreas Schwab
> ... > > instead of: > pick deadbee The oneline of this commit > ... > > Using a single character command-name allows the lines to remain > aligned, making the whole set more readable. Perhaps there should rather be an option to tell rebase to align the columns? Andrea

Re: [PATCH v2] rebase -i: add config to abbreviate command-names

2017-04-25 Thread Andreas Schwab
list would use the short version of the command resulting in > + something like this. > + > +--- > + p deadbee The oneline of this commit > + p fa1afe1 The oneline of the next commit > + ... > +-------

Re: BUG: Renaming a branch checked out in a different work tree

2017-03-29 Thread Andreas Schwab
s > itself being on the "initial commit" with all files being in the > staging area. Fixed since 2.8.3. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: Confusing git messages when disk is full.

2017-02-16 Thread Andreas Schwab
alling out the > bitwise-OR, though, just to make it clear it's not a typo). Since the order of evaluation is unspecified, it would be better to force sequencing ferror before fclose. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: Test failures when Git is built with libpcre and grep is built without it

2017-01-09 Thread Andreas Schwab
-P -E > a\x{2b}b\x{2a}c ab >actual You need to quote the regexp argument, see the line starting with "test_must_fail" above. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: [PATCH v3] am: add am.signoff add config variable

2016-12-28 Thread Andreas Schwab
On Dez 28 2016, Eduardo Habkost wrote: > @@ -32,10 +32,12 @@ OPTIONS > If you supply directories, they will be treated as Maildirs. > > -s:: > ---signoff:: > +--[no-]-signoff:: That's one dash too much. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG

Re: [PATCH v2] am: add am.signoff add config variable

2016-12-28 Thread Andreas Schwab
gnore-date] [--ignore-space-change | --ignore-whitespace] >[--whitespace=] [-C] [-p] [--directory=] > @@ -32,10 +32,12 @@ OPTIONS > If you supply directories, they will be treated as Maildirs. > > -s:: > ---signoff:: > +--[no]-signoff:: That should be --[no-]signoff, as

[PATCH v2] t6026-merge-attr: don't fail if sleep exits early

2016-11-10 Thread Andreas Schwab
nce of the pid file to test that the merge driver was actually called. Signed-off-by: Andreas Schwab --- t/t6026-merge-attr.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 7a6e33e673..03d13d00b5 100755 --- a/t/t6026-mer

Re: [PATCH] t6026-merge-attr: don't fail if sleep exits early

2016-11-09 Thread Andreas Schwab
Andreas. -- Andreas Schwab, SUSE Labs, sch...@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."

[PATCH] t6026-merge-attr: don't fail if sleep exits early

2016-11-08 Thread Andreas Schwab
Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end of test case") added a kill command to clean up after the test, but this can fail if the sleep command exits before the cleanup is executed. Ignore the error from the kill command. Signed-off-by: Andreas Schwa

Re: [PATCH] reset: --unmerge

2016-10-27 Thread Andreas Schwab
On Okt 25 2016, Junio C Hamano wrote: > Somebody with a bright idea decided that vc-git-resolve-conflicts > variable should be on by default in Emacs 25.1 X-< This is consistent with the behaviour of the other VC backends, where it isn't even customizable. Andreas. -- Andre

Re: git clone --bare --origin incompatible?

2016-10-23 Thread Andreas Schwab
t any remote-tracking branches, --origin doesn't make sense. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: Bug: git-add .* errors out

2016-09-11 Thread Andreas Schwab
chine with `git add ".*"` and it didn't error out. Probably you were running it in a subdirectory. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

Re: Should "git symbolic-ref -d HEAD" be forbidden?

2016-09-02 Thread Andreas Schwab
rs that you are no longer in a working > tree that is controlled by a repository at .git/ because .git/ is > no longer a valid repository, so you cannot even do > > $ git symbolic-ref HEAD refs/heads/master > > to recover. git init recovers it, though. Andreas. -- Andreas S

Re: Most recent revision that contains a string

2016-08-21 Thread Andreas Schwab
On Aug 20 2016, Josh Triplett wrote: > If you want to find a change that introduces or removes a particular > string, you could use "git log -S". That doesn't allow regexes, It does, actually, see --pickaxe-regex. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG K

Re: git format-patch --break-rewrites broken in 2.9.3

2016-08-19 Thread Andreas Schwab
t; What must be done now to get a usable patch? > > As an aside, the range can be shortened to > > 95fa0405c5991726e06c08ffcd8ff872f7fb4f2d^! In the context of format-patch you can also use -1 to select the topmost commit from the list. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D5

Re: Minor bug: git config ignores empty sections

2016-08-15 Thread Andreas Schwab
n goes. > - if it is a more generic comment about this configuration file, >it should stay. The comment may not be related to the surrounding keys, but just a commented-out config key that you want to keep around for reference. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG K

Re: Minor bug: git config ignores empty sections

2016-08-15 Thread Andreas Schwab
n put there on purpose. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a me

Re: [PATCH 1/2] mailinfo: extract is_from_line from mailsplit

2016-07-24 Thread Andreas Schwab
Johannes Schindelin writes: > Hi Andreas, > > On Sun, 24 Jul 2016, Andreas Schwab wrote: > >> Eric Wong writes: >> >> > diff --git a/mailinfo.c b/mailinfo.c >> > index 9f19ca1..0ebd953 100644 >> > --- a/mailinfo.c >> > +++ b/maili

Re: [PATCH 1/2] mailinfo: extract is_from_line from mailsplit

2016-07-24 Thread Andreas Schwab
+ !isdigit(colon[ 2])) > + return 0; > + > + /* year */ > + if (strtol(colon+3, NULL, 10) <= 90) > + return 0; > + > + /* Ok, close enough */ > + return 1; > +} Should this be made more strict, like by checking for a spac

Re: [ANNOUNCE] Git v2.9.1

2016-07-14 Thread Andreas Schwab
Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org

Re: [ANNOUNCE] Git v2.9.1

2016-07-12 Thread Andreas Schwab
Jeff King writes: > In case it wasn't clear, I was mostly guessing there. So I dug a bit > further, and indeed, I am wrong. Linux never bumped to a 64-bit time_t > on i386 because of the ABI headaches. This is being worked on. Andreas. -- Andreas Schwab, sch...@linux-m6

Re: [ANNOUNCE] Git v2.9.1

2016-07-12 Thread Andreas Schwab
Johannes Schindelin writes: > Hi Andreas, > > On Tue, 12 Jul 2016, Andreas Schwab wrote: > >> Johannes Schindelin writes: >> >> >> PRIuMAX isn't compatible with time_t. >> > >> > That statement is wrong. >> >> No, it is

Re: [ANNOUNCE] Git v2.9.1

2016-07-12 Thread Andreas Schwab
Johannes Schindelin writes: >> PRIuMAX isn't compatible with time_t. > > That statement is wrong. No, it isn't. PRIuMAX is for uintmax_t, and time_t is not uintmax_t (even if they happen to have the same representation). Andreas. -- Andreas Schwab, sch...@linux-m68k.o

Re: [ANNOUNCE] Git v2.9.1

2016-07-12 Thread Andreas Schwab
Q_("%" PRIuMAX " second ago", "%" PRIuMAX " seconds > ago", diff), diff); PRIuMAX isn't compatible with time_t. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4

Re: [ANNOUNCE] Git v2.9.1

2016-07-11 Thread Andreas Schwab
amp; # test_cmp expect actual This is outside the range of 32bit time_t. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe from this lis

Re: Odd git overrflow bug?

2016-07-10 Thread Andreas Schwab
de4fa746271d39d490b59bdfbbdd2cf5b54c0521 fatal: you want to use way too much memory Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe from thi

Re: Fwd: git rm

2016-07-10 Thread Andreas Schwab
Peter writes: > Ah, ok, I see now. But are there any other situations where the "-f" > switch is not needed? When the file is unmodified and matches the index. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 82

Re: Fwd: git rm

2016-07-10 Thread Andreas Schwab
Peter writes: > So if I do: > > touch abc > git add abc > > > And after that I do: > > git rm abc error: the following file has changes staged in the index: abc (use --cached to keep the file, or -f to force removal) Andreas. -- Andreas Schwab, sch...@linux-m

Re: Fwd: git rm

2016-07-06 Thread Andreas Schwab
ost data. The data is still preserved. You can restore it with "git checkout HEAD ". Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe from

Re: split directories into branches

2016-07-04 Thread Andreas Schwab
shawn wilson writes: > $ git filter-branch --tree-filter "shopt -s extglob && mkdir -p > cookbooks/base_sys && mv !(cookbooks) cookbooks/base_sys" extglob changes the parser, you need to set that on a separate line. Andreas. -- Andreas Schwab, sch...@linux-m68

Re: unable to pull from remote if commit date is in the future

2016-06-20 Thread Andreas Schwab
Norbert Kiesel writes: > For the record: the faulty commit is > https://github.com/seandepagnier/weather_routing_pi/commit/23c07cc5d2be7ce68349f4b3719b6fa6fe90e0bf That commit is part of master. Are you sure you don't have it already? Andreas. -- Andreas Schwab, sch...@linux-m

Re: [PATCH] prune: keep files created after process start

2016-06-19 Thread Andreas Schwab
+ if (st.st_mtime > expire || st.st_ctime >= start) That will also mean objects created (or their inode changed) up to a second before the start of prune will not be removed. For example, objects ejected out of a pack by a previous repack may be affected. Andreas. -- Andreas Schwab, sch...@

Re: t6044 broken on pu

2016-05-07 Thread Andreas Schwab
cription="merges with unrelated index changes" > # Commit E: renames a->subdir/a, adds subdir/e > > test_expect_success 'setup trivial merges' ' > - seq 1 10 >a && > + printf 1 2 3 4 5 7 8 9 10 >a && $ printf 1 2 3 4 5

Re: [PATCH] git-prompt: make colors available in custom prompts

2016-05-02 Thread Andreas Schwab
width), when browsing the command history. If you want to include control characters in the prompt that don't contribute to the length you have to enclose them in \[ \]. The problem is that \[ \] are processed before embedded command substitutions are expanded, thus they cannot pro

Re: history damage in linux.git

2016-04-21 Thread Andreas Schwab
d8a or 281baf7a702693deaa45c98ef0c5161006b48257. That will probably cause git describe --contains to take a different path through the history. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completel

Re: git rebase -i without altering the committer date

2016-04-20 Thread Andreas Schwab
changed, is there > any chance that this functionality could please be implemented? The easiest way to implement that is to add a graft to redirect the parent of the second commit to the inserted commit, then use git filter-branch to make the graft permanent. Andreas. -- Andreas Schwab, sch...@li

Re: [BUG] git rev-parse :/ "regex" syntax not really regex?

2016-04-17 Thread Andreas Schwab
x27;s ANSI-C quoting feature). Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe from this list: send the line "unsubscribe git" in the body of

Re: Timestamp of zero in reflog considered invalid

2016-04-05 Thread Andreas Schwab
) == ULONG_MAX && > + errno == ERANGE) || You need to set errno = 0 before calling strtoul, to distinguish the valid return of ULONG_MAX (which would keep errno intact) and a real overflow. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53

Re: git show -m with a parent number

2016-03-30 Thread Andreas Schwab
Anatoly Borodin writes: > It's not like `git diff X^2 X` is a big problem, but too much of a > copypaste. Brace expansion helps a bit: git diff X{^2,} Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 &

Re: Git clone sends first an empty authorization header

2016-03-05 Thread Andreas Schwab
ntication. The client won't know which authentication method to use until the server tells it. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe

Re: [PATCH v4 05/12] ref-filter: introduce parsing functions for each valid atom

2016-02-07 Thread Andreas Schwab
Karthik Nayak writes: > + if ((( arg && len == arg - sp) || > +(!arg && len == ep - sp )) && len == (arg ? arg : ep) - sp && Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint

Re: fast-import fails in read-only tree

2016-01-30 Thread Andreas Schwab
> mkfifo in out > (exec git cat-file --batch out) & > exec 8>in > exec 9 echo $sha >&8 > read mode type size <&9 coproc CAT_FILE git cat-file --batch echo $sha >&${CAT_FILE[1]} read mode type size <&${CAT_FILE[0]} Andr

Re: git bisect with temporary commits

2015-12-14 Thread Andreas Schwab
ked out commit except by being pointed to by HEAD. Also, testing a different commit as the one suggested by git can be useful when skipping over commits that are known to fail for unrelated reasons (see "Avoiding testing a commit" in git-bisect(1)). Andreas. -- Andreas Schwab, sch...@

  1   2   3   4   >