Advertisement
Guest User

Untitled

a guest
Jul 1st, 2019
178
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.77 KB | None | 0 0
  1. ➜ zig-source git:(function-sections) ✗ git status
  2. On branch function-sections
  3. Changes to be committed:
  4. (use "git reset HEAD <file>..." to unstage)
  5.  
  6. modified: src-self-hosted/compilation.zig
  7. modified: src-self-hosted/llvm.zig
  8. modified: src/zig_llvm.h
  9.  
  10. ➜ zig-source git:(function-sections) ✗ git commit
  11. hint: Waiting for your editor to close the file... Gtk-Message: 17:47:11.948: Failed to load module "appmenu-gtk-module"
  12. Aborting commit due to empty commit message.
  13. ➜ zig-source git:(function-sections) ✗ git diff
  14. ➜ zig-source git:(function-sections) ✗ git commit
  15. hint: Waiting for your editor to close the file... Gtk-Message: 17:47:35.086: Failed to load module "appmenu-gtk-module"
  16. [function-sections 5902735e] Added the ZigLVVMCreateTargetMachine to self hosted zig code
  17. 3 files changed, 4 insertions(+), 3 deletions(-)
  18. ➜ zig-source git:(function-sections) git status
  19. On branch function-sections
  20. nothing to commit, working tree clean
  21. ➜ zig-source git:(function-sections) git fetch upstream
  22. remote: Enumerating objects: 103, done.
  23. remote: Counting objects: 100% (103/103), done.
  24. remote: Compressing objects: 100% (13/13), done.
  25. remote: Total 117 (delta 89), reused 103 (delta 89), pack-reused 14
  26. Receiving objects: 100% (117/117), 77.76 KiB | 503.00 KiB/s, done.
  27. Resolving deltas: 100% (89/89), completed with 50 local objects.
  28. From https://github.com/ziglang/zig
  29. 0a0c1168..0dd2e93e master -> upstream/master
  30. * [new branch] rewrite-coroutines -> upstream/rewrite-coroutines
  31. * [new branch] wyhash-additions -> upstream/wyhash-additions
  32. ➜ zig-source git:(function-sections) git checkout master
  33. Switched to branch 'master'
  34. Your branch is ahead of 'origin/master' by 235 commits.
  35. (use "git push" to publish your local commits)
  36. ➜ zig-source git:(master) git merge upstream/master
  37. Updating 0a0c1168..0dd2e93e
  38. Fast-forward
  39. CMakeLists.txt | 6 +--
  40. doc/langref.html.in | 26 ++++++------
  41. src/all_types.hpp | 4 +-
  42. src/analyze.cpp | 15 ++++---
  43. src/codegen.cpp | 25 +++++++-----
  44. std/json.zig | 4 +-
  45. std/mem.zig | 6 +++
  46. std/special/c.zig | 132 ++++++++++++++++++++++++++++++++++++++++++++++++-------------
  47. std/special/{bootstrap.zig => start.zig} | 7 ++--
  48. std/special/{bootstrap_lib.zig => start_lib.zig} | 0
  49. std/special/{bootstrap_windows_tls.zig => start_windows_tls.zig} | 0
  50. std/zig/bench.zig | 2 +-
  51. 12 files changed, 159 insertions(+), 68 deletions(-)
  52. rename std/special/{bootstrap.zig => start.zig} (95%)
  53. rename std/special/{bootstrap_lib.zig => start_lib.zig} (100%)
  54. rename std/special/{bootstrap_windows_tls.zig => start_windows_tls.zig} (100%)
  55. ➜ zig-source git:(master) git checkout function-sections
  56. Switched to branch 'function-sections'
  57. ➜ zig-source git:(function-sections) git rebase master
  58. First, rewinding head to replay your work on top of it...
  59. Applying: Added function-section functionality
  60. Applying: Added ZigLLVMCreateTargetMachine and pass function-sections flag
  61. Applying: Added the ZigLVVMCreateTargetMachine to self hosted zig code
  62. ➜ zig-source git:(function-sections) git push origin function-sections
  63. Username for 'https://github.com': timonkruiper
  64. Password for 'https://timonkruiper@github.com':
  65. To https://github.com/timonkruiper/zig.git
  66. ! [rejected] function-sections -> function-sections (non-fast-forward)
  67. error: failed to push some refs to 'https://github.com/timonkruiper/zig.git'
  68. hint: Updates were rejected because the tip of your current branch is behind
  69. hint: its remote counterpart. Integrate the remote changes (e.g.
  70. hint: 'git pull ...') before pushing again.
  71. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  72. ➜ zig-source git:(function-sections) git push --help
  73. ➜ zig-source git:(function-sections) git pull origin function-sections
  74. From https://github.com/timonkruiper/zig
  75. * branch function-sections -> FETCH_HEAD
  76. Auto-merging src/zig_llvm.h
  77. Auto-merging src/zig_llvm.cpp
  78. Auto-merging src/codegen.cpp
  79. Auto-merging src/all_types.hpp
  80. Auto-merging src-self-hosted/llvm.zig
  81. hint: Waiting for your editor to close the file... Gtk-Message: 17:51:44.101: Failed to load module "appmenu-gtk-module"
  82. Merge made by the 'recursive' strategy.
  83. src-self-hosted/llvm.zig | 1 +
  84. src/codegen.cpp | 6 +++---
  85. src/zig_llvm.cpp | 4 +++-
  86. src/zig_llvm.h | 2 +-
  87. 4 files changed, 8 insertions(+), 5 deletions(-)
  88. ➜ zig-source git:(function-sections) git status
  89. On branch function-sections
  90. nothing to commit, working tree clean
  91. ➜ zig-source git:(function-sections) git log
  92. ➜ zig-source git:(function-sections) git push origin function-sections
  93. Username for 'https://github.com': timonkruiper
  94. Password for 'https://timonkruiper@github.com':
  95. Enumerating objects: 174, done.
  96. Counting objects: 100% (137/137), done.
  97. Delta compression using up to 8 threads
  98. Compressing objects: 100% (54/54), done.
  99. Writing objects: 100% (90/90), 15.80 KiB | 3.16 MiB/s, done.
  100. Total 90 (delta 70), reused 51 (delta 36)
  101. remote: Resolving deltas: 100% (70/70), completed with 30 local objects.
  102. To https://github.com/timonkruiper/zig.git
  103. ffe618c1..73258ad1 function-sections -> function-sections
  104. ➜ zig-source git:(function-sections) git log --graph --decorate --pretty=oneline --abbrev-commit
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement