100644 :1 foo/world
D foo
fast-import deletes the symlink foo and ignores foo/world. Swapping the M
line with the D line would give the correct result.
Signed-off-by: Anders Kaseorg
---
t/t9350-fast-export.sh | 24
1 file changed, 24 insertions(+)
diff --git a/t
On Fri, 21 Aug 2015, Jeff King wrote:
> - we may still have the opposite problem with renames. That is, a
> rename is _also_ a deletion, but will go to the end. So I would
> expect renaming the symlink "foo" to "bar" and then adding
> "foo/world" would end up with:
>
>M 10064
On 07/11/2016 07:54 PM, Jeff King wrote:
Yes, that's somewhat the point of the test.
How does it fail for you (what does it look like with "-v")? We may be
able to check for an outcome that matches both cases.
On Ubuntu i386 and Ubuntu armhf, I get the following verbose output from
t0006-date
For consistency with other hooks, allow the hook to be activated by
renaming pre-receive.sample to pre-receive without a separate step to
mark it executable.
Signed-off-by: Anders Kaseorg
---
templates/hooks--pre-receive.sample | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change
to-replace-refs.sh and
contrib/rerere-train.sh in tree. Fix this by using git --exec-path to
find git-sh-i18n.
While we’re here, move the sourcing of git-sh-i18n below the shell
portability fixes.
Signed-off-by: Anders Kaseorg
---
Is this a supported use of git-sh-setup? Although the documentatio
On Sun, 30 Oct 2016, Ævar Arnfjörð Bjarmason wrote:
> This seems like a reasonable fix for this issue. However as far as I
> can tell git-sh-setup was never meant to be used by outside scripts
> that didn't ship as part of git itself.
>
> If that's the case any change in the API which AFAICT is no
On Sun, 30 Oct 2016, Ævar Arnfjörð Bjarmason wrote:
> This did break in v2.10.0, and it's taken a couple of months to notice
> this, so clearly it's not very widely used, which says something about
> the cost-benefit of maintaining this for external users.
For the record, in case this affects the
tclIndex”.
Signed-off-by: Anders Kaseorg
---
git-gui/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-gui/Makefile b/git-gui/Makefile
index fe30be38d..f94b3e13d 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -252,7 +252,7 @@ $(ALL_MSGFILES): %.msg : %.po
lib
://tests.reproducible-builds.org/debian/index_variations.html).
Signed-off-by: Anders Kaseorg
---
config.mak.uname | 5 -
xdiff/xutils.c | 4
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index b232908f8..2831a68c3 100644
--- a
such as __x86_64__ rather than uname.
Signed-off-by: Anders Kaseorg
---
On Wed, 30 Nov 2016, Jeff King wrote:
> However, I think this might be the tip of the iceberg. There are lots of
> Makefile knobs whose defaults are tweaked based on uname output. This
> one caught you because you
such as __x86_64__ rather than uname.
Signed-off-by: Anders Kaseorg
---
[Oops, also resending for Thomas’s new email address. Sorry for the
spam.]
On Wed, 30 Nov 2016, Jeff King wrote:
> However, I think this might be the tip of the iceberg. There are lots of
> Makefile knobs whose de
Right now the imap:// or imaps:// part of imap.host is not being
passed on to cURL. Perhaps it was able to guess correctly under some
circumstances, but I was not able to find one; it was just trying to
make HTTP requests for me. It’s better to be explicit in any case.
Signed-off-by: Anders
ebase with 'git rebase --abort'.
Possibly related to recent GNU grep changes, as with commit
316336379cf7937c2ecf122c7197cfe5da6b2061. Avoid the issue by using sed
instead.
Signed-off-by: Anders Kaseorg
---
git-rebase--interactive.sh| 2 +-
t/t3409-rebas
The autoconf support you committed as 67f1790a has a small bug (the else
cause should omit -a):
+if grep -a ascii configure.ac >/dev/null; then
+ AC_MSG_RESULT([Using 'grep -a' for sane_grep])
+ SANE_TEXT_GREP=-a
+else
+ SANE_TEXT_GREP=-a
+fi
+GIT_CONF_SUBST([SANE_TEXT_GREP])
Anders
--
To uns
Signed-off-by: Anders Kaseorg
---
Documentation/git-bisect.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 4a1417bdcd..4b45d837a7 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git
On Tue, 21 Nov 2017, Jonathan Nieder wrote:
> http://asciidoc.org/CHANGELOG.html is stale but asciidoc still seems
> to be getting changes at https://github.com/asciidoc/asciidoc. I
> wonder how difficult it would be to add any required SOURCE_DATE_EPOCH
> support there.
In fact I already did (ht
Now gitk can be configured to display author and commit dates in their
original timezone, by putting %z into datetimeformat in ~/.gitk.
Signed-off-by: Anders Kaseorg
---
Re-sending from 2011:
http://thread.gmane.org/gmane.comp.version-control.git/165286/focus=174786
gitk | 24
The highlighting was pretty, but unfortunately, the failure mode when
source-highlight is not installed was that the entire code block
disappears. See https://bugs.debian.org/745591,
https://bugs.launchpad.net/bugs/1316810.
Signed-off-by: Anders Kaseorg
---
Documentation/technical/api
On Sat, 17 May 2014, Jeremiah Mahler wrote:
> I agree that a broken document is an unacceptable failure mode.
>
> But I do not understand why 'source-highlight' is not an install
> requirement for 'git-doc'. If I install 'source-highlight' on
> my Debian machine the code looks great.
>
> apt-g
On Mon, 19 May 2014, Junio C Hamano wrote:
> If Ubuntu does not want to use highlight, it can apply a change like the
> patch in question as part of their fork to make the end result
> consistent and they are failing to do so.
Sure, Ubuntu can apply that patch, but the larger problem remains: if
On 01/06/2014 09:14 PM, Jonathan Nieder wrote:
+test_expect_success TTY 'LESS and LV envvars are set for pagination' '
+ (
+ sane_unset LESS LV &&
+ PAGER="env >pager-env.out" &&
+ export PAGER &&
+
+ test_terminal git log
+ ) &&
ubmodule]'
/usr/lib/git-core/git-submodule: 1: eval: Syntax error: Unterminated quoted
string
Stopping at '[submodule]'; script returned non-zero status.
To fix this, if the user passed more than one argument, just execute
"$@" directly instead of passing it to eval.
Si
ubmodule]'
/usr/lib/git-core/git-submodule: 1: eval: Syntax error: Unterminated quoted
string
Stopping at '[submodule]'; script returned non-zero status.
To fix this, if the user passed more than one argument, just execute
"$@" directly instead of passing it to eval.
(check [cvswork3] diff,
when running test_cmp on two diffs).
To fix this, hide the internal order of hashes with sort when sending
output or running database queries.
(An alternative workaround is PERL_HASH_SEED=0, but this seems nicer.)
Signed-off-by: Anders Kaseorg
---
git-cvsserver.perl
Signed-off-by: Anders Kaseorg
---
t/t5516-fetch-push.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 85c7fec..594d7a6 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -238,7 +238,7 @@ test_expect_success
On Wed, 4 Mar 2015, Michael J Gruber wrote:
> If there is no "pushurl":
> "url" will be used as the "URL for fetch" and as the "URL for push".
> if we are pushing and there is "pushinsteadof" for (part of) "url"
> subsitute that within "url"
> else if there is "insteadof" for (part of) "u
GIT_PS1_DESCRIBE_STYLE was introduced in v1.6.3.2~35. Document it in the
header comments.
Signed-off-by: Anders Kaseorg
---
contrib/completion/git-prompt.sh | 9 +
1 file changed, 9 insertions(+)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index
On 10/25/2012 02:02 AM, Danny Yates wrote:
Would that not give the impression of "git sh-prompt" being a core
command?
No more than git-sh-setup, which already works like that. Unless
perhaps by “core” you mean “not contrib”.
(Now that I think of it, I saw a request from an Ubuntu PPA user
On 10/29/2012 01:10 AM, Michael Haggerty wrote:
How do you use GIT_CEILING_DIRECTORIES that the proposed changes cause a
slowdown?
Sorry to bring up this old thread again, but I just realized why my
computer has been acting so slow when I’m not connected to the network.
I put various network
On Tue, 19 Feb 2013, Junio C Hamano wrote:
> Assuming that this says "yes":
>
> D=/afs/athena.mit.edu/user/a/n/andersk/my/dir
> cd "$D"
> test "$(/bin/pwd)" = "$D" && echo yes
Correct.
> Perhaps existing of an empty element in the list would do? E.g.
>
> GIT_CEILING
30 matches
Mail list logo