problem with github
Rémy Mouëza
remy.moueza at gmail.com
Sat Nov 22 07:18:34 UTC 2025
On Saturday, 22 November 2025 at 06:12:29 UTC, Walter Bright
wrote:
> Can anyone explain what I am doing wrong? It says my master is
> the same as the remote master, but I cannot push anything.
> Googling the error message suggests I do a `git pull origin
> master` which replies with `Your branch is up-to-date with
> 'origin master'.
>
> ```
> mercury~/forks/dmd defaultInitialize2> git checkout master
> Switched to branch 'master'
> Your branch is up-to-date with 'origin/master'.
> mercury~/forks/dmd master> git pull origin master
> From github.com:WalterBright/dmd
> * branch master -> FETCH_HEAD
> Already up-to-date.
> mercury~/forks/dmd master> git checkout test
> Switched to branch 'test'
> mercury~/forks/dmd test> git rebase master
> Current branch test is up to date.
> mercury~/forks/dmd test> git diff master
> diff --git a/compiler/src/dmd/parse.d b/compiler/src/dmd/parse.d
> index 6b1ca8e..20f792c 100644
> --- a/compiler/src/dmd/parse.d
> +++ b/compiler/src/dmd/parse.d
> @@ -1,4 +1,4 @@
> -/**
> + /**
> * Takes a token stream from the lexer, and parses it into an
> abstract syntax tree.
> *
> * Specification: $(LINK2 https://dlang.org/spec/grammar.html,
> D Grammar)
> mercury~/forks/dmd test> git push origin test
> To git at github.com:WalterBright/dmd.git
> ! [rejected] test -> test (non-fast-forward)
> error: failed to push some refs to
> 'git at github.com:WalterBright/dmd.git'
> hint: Updates were rejected because the tip of your current
> branch is behind
> hint: its remote counterpart. Integrate the remote changes (e.g.
> hint: 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help'
> for details.
> mercury~/forks/dmd test>
> ```
I cannot tell about the github specifics, however, when in doubt
about the state of my branches, I run a variant of `git log -8
--graph --pretty=format:'%h - %d %s <%an>'` which will display a
textual representation of the git graph with heads and tags
annotated to the listed commits.
For many years, this has helped me to quickly figure out what was
going wrong with my branches.
On the dmd repositories, taking the last 20 entries :
```
git lg -20
* 4d0fc7370b - (HEAD -> master, origin/master, origin/HEAD) fix
regression in #20863 triggering an assertion if
TypeInfo_AssociativeArray is misdefined (#22126) (Sat, 22 Nov
2025 07:32:24 +0800) <Rainer Schuetze>
* b47add57d4 - Mark timespec_get as @system (#22120) (Fri, 21 Nov
2025 11:40:48 +0800) <Paul Backus>
* ccbcb0a191 - Implement move semantics in inliner (#22085) (Fri,
21 Nov 2025 09:57:17 +0800) <limepoutine>
* 4f3df7a23e - Fixed timespec_get annotations (#22119) (Thu, 20
Nov 2025 18:52:22 -0500) <Clouudy>
* 162592d992 - Fix Segmentation Fault: `ref return` in struct or
class (#22114) (Thu, 20 Nov 2025 23:46:51 +0800) <Hiroki Noda>
* 28051bf3f0 - Fix timespec_get Windows bindings (#22115) (Thu,
20 Nov 2025 08:13:25 +0800) <Clouudy>
* 60982f3307 - Don't elide copy when passing lvalue to value
parameters (#22113) (Thu, 20 Nov 2025 06:28:04 +0800)
<limepoutine>
* d331e61089 - Merge pull request #22092 from
Clouud9/timespec_get (Wed, 19 Nov 2025 14:46:46 -0500) <Steven
Schveighoffer>
|\
| * 19974bec5a - Formatting changes (Tue, 18 Nov 2025 14:00:44
-0500) <Clouuday>
| * 19ed973e34 - Added 32 and 64 bit versions of timespec and
timespec_get for Windows, instead of the erroneous single
implementation. (Sun, 16 Nov 2025 15:42:36 -0500) <Clouuday>
| * 4b1c85ee61 - Added documentation to specify that timespec_get
is C11. Narrowed POSIX imports. (Fri, 14 Nov 2025 13:41:27 -0500)
<Clouudy>
| * bd8b88c2aa - Newline added at end (Thu, 13 Nov 2025 20:03:35
-0500) <Clouudy>
| * fee5843161 - Fixed formatting changes (Thu, 13 Nov 2025
20:01:10 -0500) <Clouudy>
| * d469920707 - Added POSIX implementation of timespec_get (Thu,
13 Nov 2025 19:35:16 -0500) <Clouudy>
| * 4725065cc6 - Made TIME_UTC the proper value (Thu, 13 Nov 2025
19:33:13 -0500) <Clouudy>
| * 2bcd3a4690 - Added Windows implementation of timespec_get
(Thu, 13 Nov 2025 18:06:21 -0500) <Clouudy>
| * f0a4ef9630 - Merge branch 'dlang:master' into master (Wed,
12 Nov 2025 19:44:02 -0500) <Clouudy>
| |\
| * \ 95bc192924 - Merge branch 'dlang:master' into master
(Fri, 10 Oct 2025 19:47:21 -0400) <Clouudy>
| |\ \
| * | | 976a093850 - Updated so building dmd:frontend doesn't
break (Fri, 10 Oct 2025 19:45:22 -0400) <Clouuday>
* | | | f4a93db43a - Fix #22111 - call move ctor for ref __rvalue
returns (#22112) (Wed, 19 Nov 2025 17:26:05 +0800) <limepoutine>
```
The colored version of the command : `git log --graph
--pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s
%Cgreen(%cD) %C(bold blue)<%an>%Creset'`
More information about the Digitalmars-d
mailing list